diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-04-10 19:39:56 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-04-10 19:39:56 +0300 |
| commit | 2aca9b39d467f48984c246d93e3393b9851929db (patch) | |
| tree | aeeba5e2e034a50908df323d8ffe9026c80f8d2c /indra/newview | |
| parent | 0b41fd503bf4388e911b21ab98479baebd5da31a (diff) | |
CHUI-932 FIXED Restore previous text only if there is no gesture.
Diffstat (limited to 'indra/newview')
| -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); } } |