diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-04-22 23:22:09 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-04-22 23:22:09 -0700 |
| commit | 244734647c38f256ace2d64fde4d3149d37e0e25 (patch) | |
| tree | 546632cef0b87ec329966adfe03e568b49877a21 /indra/newview/llfloaterimnearbychat.cpp | |
| parent | 022dd124604c8a0a3d83b481d03a687556fcf2c4 (diff) | |
| parent | 6ad4822a05fa2d0cb0a9ab616384b374dc877883 (diff) | |
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/newview/llfloaterimnearbychat.cpp')
| -rw-r--r-- | indra/newview/llfloaterimnearbychat.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp index 49f36a2f32..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 { |