From 1e2effb043c23df5d8ecaf856c80b64a42977e8e Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Sat, 6 Nov 2010 20:50:03 +0100
Subject: IMP-688: ERROR: getString: Invalid string control nick01

Don't look for the old variable names, "nick0*", but for the new ones.
---
 linden/doc/contributions.txt           | 1 +
 linden/indra/newview/llfloaterchat.cpp | 2 +-
 linden/indra/newview/llprefscolors.cpp | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index a54424c..cd6544a 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -89,6 +89,7 @@ Aleric Inglewood
 	IMP-664
 	IMP-667
 	IMP-670
+	IMP-688
 Alissa Sabre
 	VWR-81
 	VWR-83
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"));
-- 
cgit v1.1