aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llfloaterchat.cpp2
-rw-r--r--linden/indra/newview/llprefscolors.cpp1
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)
482 for (int i=1; i<=3; i++) 482 for (int i=1; i<=3; i++)
483 { 483 {
484 std::stringstream key; 484 std::stringstream key;
485 key << "nick0" << i; 485 key << "HighlightNickname0" << i;
486 std::string nick = gSavedSettings.getString(key.str()); 486 std::string nick = gSavedSettings.getString(key.str());
487 if (! nick.empty()) 487 if (! nick.empty())
488 { 488 {
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()
71 updateSelfCheck(); 71 updateSelfCheck();
72 updateFriendsCheck(); 72 updateFriendsCheck();
73 73
74 // All three of these settings must exist, they are read by LLFloaterChat::isOwnNameInText.
74 childSetValue("nick01", gSavedSettings.getString("HighlightNickname01")); 75 childSetValue("nick01", gSavedSettings.getString("HighlightNickname01"));
75 childSetValue("nick02", gSavedSettings.getString("HighlightNickname02")); 76 childSetValue("nick02", gSavedSettings.getString("HighlightNickname02"));
76 childSetValue("nick03", gSavedSettings.getString("HighlightNickname03")); 77 childSetValue("nick03", gSavedSettings.getString("HighlightNickname03"));