diff options
| author | David Seikel | 2011-04-26 21:30:21 +1000 |
|---|---|---|
| committer | David Seikel | 2011-04-26 21:30:21 +1000 |
| commit | da97e24c3b045d16589124496d032ffb9b4ca07f (patch) | |
| tree | 34d84cf4355f83e1a106d06a10ed2a4bb121fdc4 /linden/indra/newview/llfloaterchat.cpp | |
| parent | Apparently there is a wrong client tag for firestorm out in the wild. (diff) | |
| parent | Changed version to Experimental 2011.04.19 (diff) | |
| download | meta-impy-da97e24c3b045d16589124496d032ffb9b4ca07f.zip meta-impy-da97e24c3b045d16589124496d032ffb9b4ca07f.tar.gz meta-impy-da97e24c3b045d16589124496d032ffb9b4ca07f.tar.bz2 meta-impy-da97e24c3b045d16589124496d032ffb9b4ca07f.tar.xz | |
Merge remote-tracking branch 'imprudence/exp' into exp
Conflicts (for future reference):
linden/indra/llcommon/llstring.cpp
linden/indra/newview/llpanelnetwork.cpp
linden/indra/newview/llselectmgr.cpp
linden/indra/newview/llstartup.cpp
linden/indra/newview/lltoolmgr.cpp
linden/indra/newview/llvoavatar.cpp
Diffstat (limited to 'linden/indra/newview/llfloaterchat.cpp')
| -rw-r--r-- | linden/indra/newview/llfloaterchat.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp index a28123e..4de7918 100644 --- a/linden/indra/newview/llfloaterchat.cpp +++ b/linden/indra/newview/llfloaterchat.cpp | |||
| @@ -49,6 +49,7 @@ | |||
| 49 | #include "message.h" | 49 | #include "message.h" |
| 50 | 50 | ||
| 51 | // project include | 51 | // project include |
| 52 | #include "hippogridmanager.h" | ||
| 52 | #include "llagent.h" | 53 | #include "llagent.h" |
| 53 | #include "llbutton.h" | 54 | #include "llbutton.h" |
| 54 | #include "llcheckboxctrl.h" | 55 | #include "llcheckboxctrl.h" |
| @@ -475,7 +476,7 @@ BOOL checkStringInText(const std::string &text_line, std::string textToMatch) | |||
| 475 | 476 | ||
| 476 | BOOL LLFloaterChat::isOwnNameInText(const std::string &text_line) | 477 | BOOL LLFloaterChat::isOwnNameInText(const std::string &text_line) |
| 477 | { | 478 | { |
| 478 | if (checkStringInText(text_line, gSavedSettings.getString("FirstName"))) | 479 | if (checkStringInText(text_line, gHippoGridManager->getConnectedGrid()->getFirstName())) |
| 479 | return TRUE; | 480 | return TRUE; |
| 480 | 481 | ||
| 481 | for (int i=1; i<=3; i++) | 482 | for (int i=1; i<=3; i++) |