summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-07-23 12:53:37 +0300
committerMike Antipov <mantipov@productengine.com>2010-07-23 12:53:37 +0300
commit3ec027b3161422822858b94e2743b963296f6250 (patch)
treea4dfc35eb3f5a0717832d1a57b707ced872f806b /indra
parent66bdd0903d1ded7a2e113938ad47ad8d6076416b (diff)
EXT-8318 ADDITIONAL FIXED avoid an extra copy of std::string
Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/775/ --HG-- branch : product-engine
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/llstring.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
index 804c00fd60..852a57af85 100644
--- a/indra/llcommon/llstring.cpp
+++ b/indra/llcommon/llstring.cpp
@@ -689,7 +689,7 @@ wchar_t* ll_convert_string_to_wide(const std::string& in, unsigned int code_page
std::string ll_convert_string_to_utf8_string(const std::string& in)
{
wchar_t* w_mesg = ll_convert_string_to_wide(in, CP_ACP);
- std::string out_utf8 = ll_convert_wide_to_string(w_mesg, CP_UTF8);
+ std::string out_utf8(ll_convert_wide_to_string(w_mesg, CP_UTF8));
delete[] w_mesg;
return out_utf8;