IMP-688: ERROR: getString: Invalid string control nick01

Don't look for the old variable names, "nick0*", but for the new ones.

2 files changed, 2 insertions, 1 deletions

diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index a453c39..e9ea14b 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -482,7 +482,7 @@ BOOL LLFloaterChat::isOwnNameInText(const std::string &text_line)
         for (int i=1; i<=3; i++)
         {
                 std::stringstream key;
-                key << "nick0" << i;
+                key << "HighlightNickname0" << i;
                 std::string nick = gSavedSettings.getString(key.str());
                 if (! nick.empty())
                 {
diff --git a/linden/indra/newview/llprefscolors.cpp b/linden/indra/newview/llprefscolors.cpp
index 36e98a4..b0bc345 100644
--- a/linden/indra/newview/llprefscolors.cpp
+++ b/linden/indra/newview/llprefscolors.cpp
@@ -71,6 +71,7 @@ BOOL LLPrefsColors::postBuild()
         updateSelfCheck();
         updateFriendsCheck();
         
+        // All three of these settings must exist, they are read by LLFloaterChat::isOwnNameInText.
         childSetValue("nick01", gSavedSettings.getString("HighlightNickname01"));
         childSetValue("nick02", gSavedSettings.getString("HighlightNickname02"));
         childSetValue("nick03", gSavedSettings.getString("HighlightNickname03"));