diff options
| author | Aleric Inglewood | 2010-11-06 20:50:03 +0100 |
|---|---|---|
| committer | Aleric Inglewood | 2010-11-06 20:50:03 +0100 |
| commit | 9d26172d74b6de638339f8f6336f5087c91c8831 (patch) | |
| tree | b4e1a94bbedaae9dd1ddf41e87ff71eb681e6209 /linden/indra/newview/llfloaterchat.cpp | |
| parent | Merge remote branch 'mccabe/weekly' into weekly (diff) | |
| download | meta-impy-9d26172d74b6de638339f8f6336f5087c91c8831.zip meta-impy-9d26172d74b6de638339f8f6336f5087c91c8831.tar.gz meta-impy-9d26172d74b6de638339f8f6336f5087c91c8831.tar.bz2 meta-impy-9d26172d74b6de638339f8f6336f5087c91c8831.tar.xz | |
IMP-688: ERROR: getString: Invalid string control nick01
Don't look for the old variable names, "nick0*", but for the new ones.
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llfloaterchat.cpp | 2 |
1 files changed, 1 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 | { |