diff options
author | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2008-02-19 21:42:32 +0000 |
commit | 2e32d44e7165775936beae5d9ef636ff9d3f2bd2 (patch) | |
tree | 8153bc399994aabf6e1c41c2d8332e4e8c4ddb78 /indra/llui/lluistring.h | |
parent | db0f5847ea8b96b3c1ac08e7aeb43d83daacb8e4 (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.h')
-rw-r--r-- | indra/llui/lluistring.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/indra/llui/lluistring.h b/indra/llui/lluistring.h index ede8aefbca..dd787baafe 100644 --- a/indra/llui/lluistring.h +++ b/indra/llui/lluistring.h @@ -1,7 +1,7 @@ /** * @file lluistring.h * @author: Steve Bennetts - * @brief LLUIString base class + * @brief A fancy wrapper for LLString supporting argument substitutions. * * $LicenseInfo:firstyear=2006&license=viewergpl$ * @@ -33,12 +33,6 @@ #ifndef LL_LLUISTRING_H #define LL_LLUISTRING_H -// lluistring.h -// -// Copyright 2006, Linden Research, Inc. -// Original aurthor: Steve - -#include "stdtypes.h" #include "llstring.h" #include <string> @@ -89,7 +83,7 @@ public: S32 length() const { return mWResult.size(); } void clear(); - void clearArgs(); + void clearArgs() { mArgs.clear(); } // These utuilty functions are included for text editing. // They do not affect mOrig and do not perform argument substitution |