feature: have clothing layer protection on and don't broadcast client name

3 files changed, 33 insertions, 9 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 8a48016..c1ed2b4 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -922,7 +922,7 @@
   <key>ShowClientNameTag</key>
   <map>
     <key>Comment</key>
-    <string>Show others clients in name tag</string>
+    <string>Show *others* clients in the name tag</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -930,7 +930,19 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
-
+  
+  <key>ShowMyClientTagToOthers</key>
+  <map>
+    <key>Comment</key>
+    <string>Show my client name to other viewers capable seeing it (e.g. Emerald, Imprudence, Meerkat)</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  
   <key>DownloadClientTags</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index e2be0d0..e8ee2a1 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -7404,10 +7404,14 @@ void LLAgent::sendAgentSetAppearance()
                         msg->addU8Fast(_PREHASH_TextureIndex, (U8)texture_index);
                 }
                 msg->nextBlockFast(_PREHASH_ObjectData);
-                mAvatarObject->packTEMessage    (
-                                                        gMessageSystem, 
-                                                        gSavedSettings.getBOOL("ClothingLayerProtection")
-                                                );
+
+                int shield = 0;
+                if(gSavedSettings.getBOOL("ClothingLayerProtection"))
+                {
+                        if(gSavedSettings.getBOOL("ShowMyClientTagToOthers")) shield = 1;
+                        else shield = 2;
+                }
+                mAvatarObject->packTEMessage    ( gMessageSystem, shield );
         }
         else
         {
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 22dcbf1..6fb8998 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -57,7 +57,7 @@ BOOL LLPrefsAdvanced::postBuild()
         childSetValue("disable_tp_screen_check", gSavedSettings.getBOOL("DisableTeleportScreens"));
         childSetValue("client_name_tag_check", gSavedSettings.getBOOL("ShowClientNameTag"));
         childSetValue("windlight_check", gSavedSettings.getBOOL("UseServersideWindlightSettings"));
-        childSetValue("client_name_tag_broadcast_check", gSavedSettings.getBOOL("ClothingLayerProtection"));
+        childSetValue("client_name_tag_broadcast_check", gSavedSettings.getBOOL("ShowMyClientTagToOthers"));
         childSetValue("http_texture_check", gSavedSettings.getBOOL("ImagePipelineUseHTTP"));
         childSetValue("speed_rez_check", gSavedSettings.getBOOL("SpeedRez"));
         childSetValue("speed_rez_interval_spinner", (F32)gSavedSettings.getU32("SpeedRezInterval"));
@@ -81,8 +81,16 @@ void LLPrefsAdvanced::apply()
         gSavedSettings.setBOOL("UseServersideWindlightSettings", childGetValue("windlight_check"));
 
         // Need to force a rebake when ClothingLayerProtection toggled for it take effect -- MC
-        if (gSavedSettings.getBOOL("ClothingLayerProtection") != (BOOL)childGetValue("client_name_tag_broadcast_check"))
+        if (gSavedSettings.getBOOL("ShowMyClientTagToOthers") != (BOOL)childGetValue("client_name_tag_broadcast_check"))
         {
+                if(gSavedSettings.getBOOL("ShowMyClientTagToOthers"))
+                {
+                        //ShowMyClientTagToOthers works only with ClothingLayerProtection true,
+                        //while not showing also works with ClothingLayerProtection false.
+                        //since ClothingLayerProtection true is preferrable only switch ON
+                        gSavedSettings.setBOOL("ClothingLayerProtection", TRUE);
+                }
+
                 LLVOAvatar* avatar = gAgent.getAvatarObject();
                 if (avatar)
                 {
@@ -91,7 +99,7 @@ void LLPrefsAdvanced::apply()
                         avatar->forceBakeAllTextures(slam_for_debug);
                 }
         }
-        gSavedSettings.setBOOL("ClothingLayerProtection", childGetValue("client_name_tag_broadcast_check"));
+        gSavedSettings.setBOOL("ShowMyClientTagToOthers", childGetValue("client_name_tag_broadcast_check"));
 
         // This is bad bad BAD UI from Emerald, I know. 
         // If anyone wants to do this better, please do -- MC