diff options
author | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
commit | 25c10ed028da5c547b11f1f461916897272b0e6d (patch) | |
tree | 350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/newview/llanimstatelabels.cpp | |
parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llanimstatelabels.cpp')
-rw-r--r-- | indra/newview/llanimstatelabels.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llanimstatelabels.cpp b/indra/newview/llanimstatelabels.cpp index 380bf7c39c..7877bd7d2f 100644 --- a/indra/newview/llanimstatelabels.cpp +++ b/indra/newview/llanimstatelabels.cpp @@ -33,7 +33,7 @@ #include "llanimstatelabels.h" #include "lltrans.h" -std::string LLAnimStateLabels::getStateLabel( const char *animName ) +std::string LLAnimStateLabels::getStateLabel( const char* animName ) { - return LLTrans::getString("anim_" + LLString(animName) ); + return LLTrans::getString(std::string("anim_") + std::string(animName) ); } |