diff options
| author | Richard Linden <none@none> | 2010-10-15 15:12:21 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-10-15 15:12:21 -0700 |
| commit | dbdef5595a1358ca6173929b740b683e98c96bb0 (patch) | |
| tree | 4ed53277ce44c8569317e82b92194b3afec5ed09 /indra/llui/lluistring.cpp | |
| parent | 3b8153002f9ad61ee316fc127bf3c6b86f1f6011 (diff) | |
| parent | 6357806dd0d4f70822ba6aa453efbe3a54dc32af (diff) | |
merge
Diffstat (limited to 'indra/llui/lluistring.cpp')
| -rw-r--r-- | indra/llui/lluistring.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lluistring.cpp b/indra/llui/lluistring.cpp index d805e37c09..ac69d3bf85 100644 --- a/indra/llui/lluistring.cpp +++ b/indra/llui/lluistring.cpp @@ -129,7 +129,7 @@ void LLUIString::updateResult() const mResult = mOrig; // get the defailt args + local args - if (!mArgs.get() || mArgs->empty()) + if (!mArgs || mArgs->empty()) { LLStringUtil::format(mResult, LLTrans::getDefaultArgs()); } @@ -150,7 +150,7 @@ void LLUIString::updateWResult() const LLStringUtil::format_map_t& LLUIString::getArgs() { - if (!mArgs.get()) + if (!mArgs) { mArgs = new LLStringUtil::format_map_t; } |