From b3acc0cfe9664bdba95f18867f9159e631e702af Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Thu, 17 Dec 2020 15:09:34 -0500
Subject: [PATCH] Revert "more format cleanup"
This reverts commit 0430171a778887dd694b7e3187e69620bb29c0f4.
---
indra/llcommon/u64.cpp | 6 +++---
indra/llui/lltexteditor.cpp | 9 ++++++++-
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/indra/llcommon/u64.cpp b/indra/llcommon/u64.cpp
index 462865a77d2..02c2c15d260 100644
--- a/indra/llcommon/u64.cpp
+++ b/indra/llcommon/u64.cpp
@@ -66,15 +66,15 @@ std::string U64_to_str(U64 value)
if (part1)
{
- res = absl::StrFormat("%u%07u%07u",part1,part2,part3);
+ res = llformat("%u%07u%07u",part1,part2,part3);
}
else if (part2)
{
- res = absl::StrFormat("%u%07u",part2,part3);
+ res = llformat("%u%07u",part2,part3);
}
else
{
- res = absl::StrFormat("%u",part3);
+ res = llformat("%u",part3);
}
return res;
}
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 7175e97aa96..8fd7c4bae3d 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -2671,7 +2671,14 @@ BOOL LLTextEditor::importBuffer(const char* buffer, S32 length )
BOOL LLTextEditor::exportBuffer(std::string &buffer )
{
- buffer = absl::StrFormat("Linden text version 1\n{\nText length %d\n%s}\n", getLength(), getText());
+ std::ostringstream outstream(buffer);
+
+ outstream << "Linden text version 1\n";
+ outstream << "{\n";
+
+ outstream << llformat("Text length %d\n", getLength() );
+ outstream << getText();
+ outstream << "}\n";
return TRUE;
}
--
GitLab