summaryrefslogtreecommitdiff
path: root/indra/llui/lluistring.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2008-02-19 21:42:32 +0000
committerSteven Bennetts <steve@lindenlab.com>2008-02-19 21:42:32 +0000
commit2e32d44e7165775936beae5d9ef636ff9d3f2bd2 (patch)
tree8153bc399994aabf6e1c41c2d8332e4e8c4ddb78 /indra/llui/lluistring.cpp
parentdb0f5847ea8b96b3c1ac08e7aeb43d83daacb8e4 (diff)
merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
Diffstat (limited to 'indra/llui/lluistring.cpp')
-rw-r--r--indra/llui/lluistring.cpp12
1 files changed, 1 insertions, 11 deletions
diff --git a/indra/llui/lluistring.cpp b/indra/llui/lluistring.cpp
index b0da5dd7fb..d6496b1a41 100644
--- a/indra/llui/lluistring.cpp
+++ b/indra/llui/lluistring.cpp
@@ -1,6 +1,6 @@
/**
* @file lluistring.cpp
- * @brief LLUIString base class
+ * @brief LLUIString implementation.
*
* $LicenseInfo:firstyear=2006&license=viewergpl$
*
@@ -30,14 +30,11 @@
*/
#include "linden_common.h"
-
#include "lluistring.h"
const LLString::format_map_t LLUIString::sNullArgs;
-// public
-
LLUIString::LLUIString(const LLString& instring, const LLString::format_map_t& args)
: mOrig(instring),
mArgs(args)
@@ -98,13 +95,6 @@ void LLUIString::clear()
mWResult.clear();
}
-void LLUIString::clearArgs()
-{
- mArgs.clear();
-}
-
-// private
-
void LLUIString::format()
{
mResult = mOrig;