Added custom nametag coloring for Imprudence tags (local only)

1 files changed, 8 insertions, 0 deletions

diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 89dc0b2..c3a9c0b 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -82,12 +82,16 @@ BOOL LLPrefsAdvanced::postBuild()
 {
         childSetValue("disable_log_screen_check", gSavedSettings.getBOOL("DisableLoginLogoutScreens"));
         childSetValue("disable_tp_screen_check", gSavedSettings.getBOOL("DisableTeleportScreens"));
+
         static BOOL* sShowClientNameTag = rebind_llcontrol<BOOL>("ShowClientNameTag", &gSavedSettings, true);
         childSetValue("client_name_tag_check", (*sShowClientNameTag));
         static BOOL* sShowClientColor = rebind_llcontrol<BOOL>("ShowClientColor", &gSavedSettings, true);
         childSetValue("client_name_color_check", (*sShowClientColor));
         childSetValue("client_name_hover_check", gSavedSettings.getBOOL("ShowClientNameHoverTip"));
         childSetValue("client_name_tag_broadcast_check", gSavedSettings.getBOOL("ShowMyClientTagToOthers"));
+        getChild<LLColorSwatchCtrl>("client_tag_color")->set(gSavedSettings.getColor4("ImprudenceTagColor"));
+        mClientTagColor = gSavedSettings.getColor4("ImprudenceTagColor");
+
         childSetValue("http_texture_check", gSavedSettings.getBOOL("ImagePipelineUseHTTP"));
         childSetValue("speed_rez_check", gSavedSettings.getBOOL("SpeedRez"));
         childSetValue("speed_rez_interval_spinner", (F32)gSavedSettings.getU32("SpeedRezInterval"));
@@ -127,6 +131,9 @@ void LLPrefsAdvanced::apply()
         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.setColor4("ImprudenceTagColor", getChild<LLColorSwatchCtrl>("client_tag_color")->get());
+        mClientTagColor = getChild<LLColorSwatchCtrl>("client_tag_color")->get();
+
         gSavedSettings.setBOOL("ImagePipelineUseHTTP", childGetValue("http_texture_check"));
         gSavedSettings.setBOOL("SpeedRez", childGetValue("speed_rez_check"));
         gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval_spinner").asReal());
@@ -205,6 +212,7 @@ void LLPrefsAdvanced::apply()
 
 void LLPrefsAdvanced::cancel()
 {
+        gSavedSettings.setColor4("ImprudenceTagColor", mClientTagColor);
 }
 
 void LLPrefsAdvanced::refresh()