Added checkbox for broadcasting client tag to Preferences > Advanced (and fixed the show client in name tags checkbox)

1 files changed, 4 insertions, 1 deletions

diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 0f1e2a3..bf96ad1 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3480,7 +3480,10 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                 if(!mIsSelf) //don't know your own client ?
                                 {
                                         new_name = TRUE; //lol or see the last client used 
-                                        resolveClient(avatar_name_color,client, this);
+                                        if (gSavedSettings.getBOOL("ShowClientNameTag"))
+                                        {
+                                                resolveClient(avatar_name_color,client, this);
+                                        }
                                 }
                                 avatar_name_color.setAlpha(alpha);
                                 mNameText->setColor(avatar_name_color);