diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-09-24 11:23:07 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-09-24 11:23:07 -0700 |
| commit | b85cf7b12562a3359e52147d26eb1051ce388559 (patch) | |
| tree | 3f656bb586e7cd2a25763d8053365e106365a063 /indra/newview/llchatbar.cpp | |
| parent | 24473fc0d619beaafab029170a7aacde5855be1a (diff) | |
| parent | b34856d66dfa1a725cb85d813982709566b6db7a (diff) | |
Pull update from viewer-development
Diffstat (limited to 'indra/newview/llchatbar.cpp')
| -rw-r--r-- | indra/newview/llchatbar.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp index d251931eca..6e58be8174 100644 --- a/indra/newview/llchatbar.cpp +++ b/indra/newview/llchatbar.cpp @@ -565,6 +565,10 @@ void LLChatBar::sendChatFromViewer(const std::string &utf8text, EChatType type, void LLChatBar::sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL animate) { + // as soon as we say something, we no longer care about teaching the user + // how to chat + gWarningSettings.setBOOL("FirstOtherChatBeforeUser", FALSE); + // Look for "/20 foo" channel chats. S32 channel = 0; LLWString out_text = stripChannelNumber(wtext, &channel); @@ -685,14 +689,14 @@ public: } else { - S32 channel = tokens[0].asInteger(); + S32 channel = tokens[0].asInteger(); // VWR-19499 Restrict function to chat channels greater than 0. if ((channel > 0) && (channel < 2147483647)) { retval = true; // Say mesg on channel - std::string mesg = tokens[1].asString(); - send_chat_from_viewer(mesg, CHAT_TYPE_NORMAL, channel); + std::string mesg = tokens[1].asString(); + send_chat_from_viewer(mesg, CHAT_TYPE_NORMAL, channel); } else { |