4 files changed, 1 insertions, 18 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 806572e04d..920d09bd7f 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -230,6 +230,7 @@ void handleNameTagOptionChanged(const LLSD& newvalue)
 void handleDisplayNamesOptionChanged(const LLSD& newvalue)
 {
 	LLAvatarNameCache::setUseDisplayNames(newvalue.asBoolean());
+	LLVOAvatar::invalidateNameTags();
 }
 
 
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index b661e1bcd1..f31f1e80e1 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -7588,15 +7588,6 @@ class LLWorldToggleCameraControls : public view_listener_t
 	}
 };
 
-// IDEVO JAMESDEBUG temp code for testing
-void toggle_display_names()
-{
-	bool use = LLAvatarNameCache::useDisplayNames();
-	LLAvatarNameCache::setUseDisplayNames(!use);
-
-	LLVOAvatar::invalidateNameTags();
-}
-
 void show_navbar_context_menu(LLView* ctrl, S32 x, S32 y)
 {
 	static LLMenuGL*	show_navbar_context_menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_hide_navbar.xml",
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 7e061d69c9..cc38616cb8 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -665,7 +665,6 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
 	mNameAlpha(0.f),
 	mRenderGroupTitles(sRenderGroupTitles),
 	mNameCloud(false),
-	mUseDisplayNames( LLAvatarNameCache::useDisplayNames() ),
 	mFirstTEMessageReceived( FALSE ),
 	mFirstAppearanceMessageReceived( FALSE ),
 	mCulled( FALSE ),
@@ -2748,13 +2747,6 @@ 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 703066b7a6..c99902a540 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -843,7 +843,6 @@ private:
 	bool			mNameCloud;
 	F32				mNameAlpha;
 	BOOL      		mRenderGroupTitles;
-	bool			mUseDisplayNames; // IDEVO HACK to force refresh
 
 	//--------------------------------------------------------------------
 	// Display the name (then optionally fade it out)