Changed nickname highlight nick settings from 'nick#' to 'HighlightNickname#' to match the rest of settings.xml. Nicknames set before this commit will need to be set again due to the new preferences name

2 files changed, 9 insertions, 9 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index ccee513..22e4aa5 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -6,7 +6,7 @@
 
   <!-- begin name highlighting -->
   
-  <key>nick01</key>
+  <key>HighlightNickname01</key>
   <map>
     <key>Comment</key>
     <string>First Nickname for Chat Highlight</string>
@@ -17,7 +17,7 @@
     <key>Value</key>
     <string></string>
   </map>
-  <key>nick02</key>
+  <key>HighlightNickname02</key>
   <map>
     <key>Comment</key>
     <string>Second Nickname for Chat Highlight</string>
@@ -28,7 +28,7 @@
     <key>Value</key>
     <string></string>
   </map>
-  <key>nick03</key>
+  <key>HighlightNickname03</key>
   <map>
     <key>Comment</key>
     <string>Third Nickname for Chat Highlight</string>
diff --git a/linden/indra/newview/llprefscolors.cpp b/linden/indra/newview/llprefscolors.cpp
index 9a30fcd..36e98a4 100644
--- a/linden/indra/newview/llprefscolors.cpp
+++ b/linden/indra/newview/llprefscolors.cpp
@@ -71,9 +71,9 @@ BOOL LLPrefsColors::postBuild()
         updateSelfCheck();
         updateFriendsCheck();
         
-        childSetValue("nick01", gSavedSettings.getString("nick01"));
-        childSetValue("nick02", gSavedSettings.getString("nick02"));
-        childSetValue("nick03", gSavedSettings.getString("nick03"));
+        childSetValue("nick01", gSavedSettings.getString("HighlightNickname01"));
+        childSetValue("nick02", gSavedSettings.getString("HighlightNickname02"));
+        childSetValue("nick03", gSavedSettings.getString("HighlightNickname03"));
 
         childSetCommitCallback("HighlightOwnNameInIM", onCommitCheckSelfName, this);
         childSetCommitCallback("HighlightOwnNameInChat", onCommitCheckSelfName, this);
@@ -166,15 +166,15 @@ void LLPrefsColors::apply()
 
         std::string nick01 = childGetValue("nick01");
         boost::trim(nick01);
-        gSavedSettings.setString("nick01", nick01);
+        gSavedSettings.setString("HighlightNickname01", nick01);
 
         std::string nick02 = childGetValue("nick02");
         boost::trim(nick02);
-        gSavedSettings.setString("nick02", nick02);
+        gSavedSettings.setString("HighlightNickname02", nick02);
 
         std::string nick03 = childGetValue("nick03");
         boost::trim(nick03);
-        gSavedSettings.setString("nick03", nick03);
+        gSavedSettings.setString("HighlightNickname03", nick03);
 
         refreshColors(); // member values become the official values and cancel becomes a no-op.
 }