diff options
| author | James Cook <james@lindenlab.com> | 2010-02-19 11:11:45 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-02-19 11:11:45 -0800 |
| commit | af8f8b4770eb45b4238d98ddd574ba726470f797 (patch) | |
| tree | 35d9204adff7894c971b47b0e0642de486f136c3 /indra/newview | |
| parent | c1d7e7d5d961819255f6f2fe4de5ece3b80867db (diff) | |
Improved support for toggling display names on/off
Stop pre-populated name cache because we have a web service now for lookup
Added mIsLegacy to LLAvatarName so we can colorize those name tags differently
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llvoavatar.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 04809caa6f..73f292cbca 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -660,6 +660,7 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id, mNameFriend(false), mNameAlpha(0.f), mRenderGroupTitles(sRenderGroupTitles), + mUseDisplayNames( LLAvatarNameCache::useDisplayNames() ), mFirstTEMessageReceived( FALSE ), mFirstAppearanceMessageReceived( FALSE ), mCulled( FALSE ), @@ -2695,6 +2696,13 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last) new_name = TRUE; } + // IDEVO HACK to force refresh + if (LLAvatarNameCache::useDisplayNames() != mUseDisplayNames) + { + mUseDisplayNames = LLAvatarNameCache::useDisplayNames(); + new_name = TRUE; + } + // First Calculate Alpha // If alpha > 0, create mNameText if necessary, otherwise delete it F32 alpha = 0.f; diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index cf3f40979b..f70c68bcba 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -831,6 +831,7 @@ private: bool mNameFriend; F32 mNameAlpha; BOOL mRenderGroupTitles; + bool mUseDisplayNames; // IDEVO HACK to force refresh //-------------------------------------------------------------------- // Display the name (then optionally fade it out) |