diff options
| author | Cho <cho@lindenlab.com> | 2013-03-18 23:01:31 +0100 | 
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2013-03-18 23:01:31 +0100 | 
| commit | e98b0c43bcb38acea75e969b064c6dff8536b359 (patch) | |
| tree | a86cb12fcc1701faa5e7043d26d2b3695eb6d58e /indra/newview | |
| parent | a17ed876c8c55cb4f8977f5dbcec4ae99df98d70 (diff) | |
| parent | 22203b43db851a611adbaa2413bc92a14dd7f951 (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 1 | 
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()) | 
