summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2013-03-18 15:57:26 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2013-03-18 15:57:26 -0700
commitf2ddebe4314628a066154f64b71c01c11d7e746a (patch)
tree8ae7f2c8a3e49167d7e6f24f087d3484ba4a27c3
parent73f68342f657984d6ab3447f3f9dbc44f35b1982 (diff)
parente98b0c43bcb38acea75e969b064c6dff8536b359 (diff)
merge
-rw-r--r--indra/newview/llvoavatar.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index c74d9f1292..d295fc60cd 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3097,6 +3097,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
// Rebuild name tag if state change detected
if (mNameString.empty()
+ || (mNameString.size() == 2 && mNameString[0] == 10 && mNameString[1] == 10) // *TODO : find out why mNameString is sometimes ""
|| new_name
|| (!title && !mTitle.empty())
|| (title && mTitle != title->getString())