6 files changed, 91 insertions, 17 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 1f5c7b2..dcbda36 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -1055,7 +1055,28 @@
   </map>
 
   <!-- Begin: Client Name Tag -->
-
+  <key>ShowClientColor</key>
+  <map>
+    <key>Comment</key>
+    <string>Show *others* clients specific color in the name tag</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>ShowClientNameHoverTip</key>
+  <map>
+    <key>Comment</key>
+    <string>Show *others* client in the hovertip</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   <key>ShowClientNameTag</key>
   <map>
     <key>Comment</key>
@@ -1067,7 +1088,7 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
-  
+
   <key>ShowMyClientTagToOthers</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llhoverview.cpp b/linden/indra/newview/llhoverview.cpp
index 5d59818..8c367ab 100644
--- a/linden/indra/newview/llhoverview.cpp
+++ b/linden/indra/newview/llhoverview.cpp
@@ -64,6 +64,7 @@
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
 #include "llviewerwindow.h"
+#include "llvoavatar.h"
 #include "llglheaders.h"
 #include "llviewerimagelist.h"
 //#include "lltoolobjpicker.h"
@@ -272,6 +273,31 @@ void LLHoverView::updateText()
                                 line.append(LLTrans::getString("TooltipPerson"));
                         }
                         mText.push_back(line);
+
+                        if (gSavedSettings.getBOOL("ShowClientNameHoverTip"))
+                        {
+                                LLColor4 color;
+                                std::string client;
+                                LLVOAvatar* avatar = (LLVOAvatar*)hit_object;
+                                if (avatar->isSelf())
+                                {
+                                        client="Client: Imprudence";
+                                }
+                                else
+                                {
+                                        LLVOAvatar::resolveClient(color, client, avatar);
+                                        if(client.empty() ||client == "Invalid" || client == "Failure")
+                                        {
+                                                client = "Client: <not available>";
+                                        }
+                                        else
+                                        {
+                                                client = "Client: " + client;
+                                        } 
+                                }
+                                mText.push_back(client);
+                                
+                        }
                 }
                 else
                 {
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 7830c29..34c8eb2 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -58,6 +58,8 @@ BOOL LLPrefsAdvanced::postBuild()
         childSetValue("disable_log_screen_check", gSavedSettings.getBOOL("DisableLoginLogoutScreens"));
         childSetValue("disable_tp_screen_check", gSavedSettings.getBOOL("DisableTeleportScreens"));
         childSetValue("client_name_tag_check", gSavedSettings.getBOOL("ShowClientNameTag"));
+        childSetValue("client_name_color_check", gSavedSettings.getBOOL("ShowClientColor"));
+        childSetValue("client_name_hover_check", gSavedSettings.getBOOL("ShowClientNameHoverTip"));
         childSetValue("client_name_tag_broadcast_check", gSavedSettings.getBOOL("ShowMyClientTagToOthers"));
         childSetValue("http_texture_check", gSavedSettings.getBOOL("ImagePipelineUseHTTP"));
         childSetValue("speed_rez_check", gSavedSettings.getBOOL("SpeedRez"));
@@ -81,6 +83,8 @@ void LLPrefsAdvanced::apply()
         gSavedSettings.setBOOL("DisableLoginLogoutScreens", childGetValue("disable_log_screen_check"));
         gSavedSettings.setBOOL("DisableTeleportScreens", childGetValue("disable_tp_screen_check"));
         gSavedSettings.setBOOL("ShowClientNameTag", childGetValue("client_name_tag_check"));
+        gSavedSettings.setBOOL("ShowClientColor", childGetValue("client_name_color_check"));
+        gSavedSettings.setBOOL("ShowClientNameHoverTip", childGetValue("client_name_hover_check"));
         gSavedSettings.setBOOL("ImagePipelineUseHTTP", childGetValue("http_texture_check"));
         gSavedSettings.setBOOL("SpeedRez", childGetValue("speed_rez_check"));
         gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval_spinner").asReal());
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 200b3a6..53962a9 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3544,21 +3544,29 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                 }
                                 
                                 LLColor4 avatar_name_color = gColors.getColor( "AvatarNameColor" );
-                                if (gSavedSettings.getBOOL("ShowClientNameTag"))
+                                LLColor4 client_color = avatar_name_color;
+
+                                if(!mIsSelf) //don't know your own client ?
                                 {
-                                        if(!mIsSelf) //don't know your own client ?
+                                        new_name = TRUE; //lol or see the last client used 
                                         {
-                                                new_name = TRUE; //lol or see the last client used 
-                                                {
-                                                        resolveClient(avatar_name_color,client, this);
-                                                }
-                                        }
-                                        else
-                                        {
-                                                // Set your own name to the Imprudence color -- MC
-                                                avatar_name_color = LLColor4(0.79f,0.44f,0.88f);
+                                                resolveClient(client_color,client, this);
                                         }
                                 }
+                                else
+                                {
+                                        // Set your own name to the Imprudence color -- MC
+                                        client_color = LLColor4(0.79f,0.44f,0.88f);
+                                }
+                                if (gSavedSettings.getBOOL("ShowClientColor"))
+                                {
+                                        avatar_name_color = client_color;
+                                }
+                                if (!gSavedSettings.getBOOL("ShowClientNameTag"))
+                                {
+                                        client.clear();
+                                }
+
                                 avatar_name_color.setAlpha(alpha);
                                 mNameText->setColor(avatar_name_color);
                                 
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h
index 36ed22a..0c32244 100644
--- a/linden/indra/newview/llvoavatar.h
+++ b/linden/indra/newview/llvoavatar.h
@@ -658,10 +658,11 @@ private:
         static LLVector3d sBeamLastAt;
         static LLSD sClientResolutionList;
 
+public: //anything against having this public?
         static void resolveClient(LLColor4& avatar_name_color, std::string& client, LLVOAvatar* avatar);
 //Imprudence FIXME
 //      friend class LLFloaterAvatarList;
-
+//      friend class LLHoverView;
 protected:
         LLPointer<LLHUDEffectSpiral> mBeam;
         LLFrameTimer mBeamTimer;
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index de34ebd..7528809 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -14,10 +14,24 @@
              font="SansSerifSmall" height="16" initial_value="false"
              label="Disable teleport screen" left="12" mouse_opaque="true"
              name="disable_tp_screen_check" radio_style="false" width="217" />
-  <check_box bottom_delta="-25" enabled="true" follows="left|top"
+   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                        bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
+                        font="SansSerifsmall" h_pad="0" halign="left" height="16" left="16"
+                        mouse_opaque="true" name="online_no" v_pad="0" width="200">
+   Show client names:
+  </text>
+  <check_box bottom_delta="0" enabled="true" follows="left|top"
+       font="SansSerifSmall" height="16" initial_value="false"
+       label="in nametag" left_delta="100" mouse_opaque="true"
+       name="client_name_tag_check" radio_style="false" width="160" />
+  <check_box bottom_delta="0" enabled="true" follows="left|top"
+       font="SansSerifSmall" height="16" initial_value="false"
+       label="changing nametag color" left_delta="80" mouse_opaque="true"
+       name="client_name_color_check" radio_style="false" width="160" />
+  <check_box bottom_delta="0" enabled="true" follows="left|top"
        font="SansSerifSmall" height="16" initial_value="false"
-       label="Show client names in nametag" left="12" mouse_opaque="true"
-       name="client_name_tag_check" radio_style="false" width="217" />
+       label="in tooltip" left_delta="140" mouse_opaque="true"
+       name="client_name_hover_check" radio_style="false" width="160" />
   <check_box bottom_delta="-18" enabled="true" follows="left|top"
        font="SansSerifSmall" height="16" initial_value="false"
        label="Broadcast your client name to others" left="12" mouse_opaque="true"