aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-09-20 14:19:50 -0700
committerMcCabe Maxsted2009-09-20 14:20:05 -0700
commitf1390461aa1a6b85d5f4cacf264f595640b91672 (patch)
treed144836e8de53599c37413f84b7612bc9d58056f /linden/indra/newview
parentFixed inventory offers not avatar name (another RLVa bug) (diff)
downloadmeta-impy-f1390461aa1a6b85d5f4cacf264f595640b91672.zip
meta-impy-f1390461aa1a6b85d5f4cacf264f595640b91672.tar.gz
meta-impy-f1390461aa1a6b85d5f4cacf264f595640b91672.tar.bz2
meta-impy-f1390461aa1a6b85d5f4cacf264f595640b91672.tar.xz
Fixed group titles showing up as ?
Diffstat (limited to 'linden/indra/newview')
-rw-r--r--linden/indra/newview/llvoavatar.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 158977e..24272d8 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3261,7 +3261,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
3261 if (title && title->getString() && title->getString()[0] != '\0') 3261 if (title && title->getString() && title->getString()[0] != '\0')
3262 { 3262 {
3263 line += title->getString(); 3263 line += title->getString();
3264 LLStringFn::replace_nonprintable(line,LL_UNKNOWN_CHAR); 3264 //LLStringFn::replace_nonprintable(line,LL_UNKNOWN_CHAR); IMP-136 -- MC
3265 line += "\n"; 3265 line += "\n";
3266 line += firstname->getString(); 3266 line += firstname->getString();
3267 } 3267 }
@@ -3321,7 +3321,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
3321 mNameMute = is_muted; 3321 mNameMute = is_muted;
3322 mNameAppearance = is_appearance; 3322 mNameAppearance = is_appearance;
3323 mTitle = title ? title->getString() : ""; 3323 mTitle = title ? title->getString() : "";
3324 LLStringFn::replace_nonprintable(mTitle,LL_UNKNOWN_CHAR); 3324 //LLStringFn::replace_nonprintable(mTitle,LL_UNKNOWN_CHAR); IMP-136 -- MC
3325 mNameString = utf8str_to_wstring(line); 3325 mNameString = utf8str_to_wstring(line);
3326 new_name = TRUE; 3326 new_name = TRUE;
3327 } 3327 }