diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-04-19 17:50:48 +0300 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-04-19 17:50:48 +0300 |
| commit | cfd132a0def48a3dff62aebc480feeb4639babea (patch) | |
| tree | 6d57e930162bf4d51652a07d18e68c4202e38734 /indra/newview/llfloaterimnearbychat.cpp | |
| parent | 6a339649844a6e016e35e440004a61d07dd490e6 (diff) | |
| parent | 09b70845e52f75a33c608062db6516784b31fa72 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloaterimnearbychat.cpp')
| -rw-r--r-- | indra/newview/llfloaterimnearbychat.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp index 266b5b20ee..7e472466ed 100644 --- a/indra/newview/llfloaterimnearbychat.cpp +++ b/indra/newview/llfloaterimnearbychat.cpp @@ -568,7 +568,10 @@ void LLFloaterIMNearbyChat::sendChat( EChatType type ) if (0 == channel) { // discard returned "found" boolean - LLGestureMgr::instance().triggerAndReviseString(utf8text, &utf8_revised_text); + if(!LLGestureMgr::instance().triggerAndReviseString(utf8text, &utf8_revised_text)) + { + utf8_revised_text = utf8text; + } } else { @@ -582,7 +585,6 @@ void LLFloaterIMNearbyChat::sendChat( EChatType type ) if (!utf8_revised_text.empty()) { // Chat with animation - utf8_revised_text = utf8text; sendChatFromViewer(utf8_revised_text, type, TRUE); } } |