diff options
Diffstat (limited to 'linden/indra/newview/llchatbar.cpp')
-rw-r--r-- | linden/indra/newview/llchatbar.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp index 84ebf98..59aa572 100644 --- a/linden/indra/newview/llchatbar.cpp +++ b/linden/indra/newview/llchatbar.cpp | |||
@@ -48,6 +48,7 @@ | |||
48 | #include "llcommandhandler.h" // secondlife:///app/chat/ support | 48 | #include "llcommandhandler.h" // secondlife:///app/chat/ support |
49 | #include "llviewercontrol.h" | 49 | #include "llviewercontrol.h" |
50 | #include "llfloaterchat.h" | 50 | #include "llfloaterchat.h" |
51 | #include "llfloatergesture.h" | ||
51 | #include "llgesturemgr.h" | 52 | #include "llgesturemgr.h" |
52 | #include "llkeyboard.h" | 53 | #include "llkeyboard.h" |
53 | #include "lllineeditor.h" | 54 | #include "lllineeditor.h" |
@@ -646,8 +647,9 @@ void LLChatBar::onCommitGesture(LLUICtrl* ctrl, void* data) | |||
646 | if (gestures) | 647 | if (gestures) |
647 | { | 648 | { |
648 | S32 index = gestures->getFirstSelectedIndex(); | 649 | S32 index = gestures->getFirstSelectedIndex(); |
649 | if (index == 0) | 650 | if (index <= 0) |
650 | { | 651 | { |
652 | LLFloaterGesture::toggleVisibility(); | ||
651 | return; | 653 | return; |
652 | } | 654 | } |
653 | const std::string& trigger = gestures->getSelectedValue().asString(); | 655 | const std::string& trigger = gestures->getSelectedValue().asString(); |
@@ -657,7 +659,6 @@ void LLChatBar::onCommitGesture(LLUICtrl* ctrl, void* data) | |||
657 | std::string text(trigger); | 659 | std::string text(trigger); |
658 | std::string revised_text; | 660 | std::string revised_text; |
659 | gGestureManager.triggerAndReviseString(text, &revised_text); | 661 | gGestureManager.triggerAndReviseString(text, &revised_text); |
660 | |||
661 | revised_text = utf8str_trim(revised_text); | 662 | revised_text = utf8str_trim(revised_text); |
662 | if (!revised_text.empty()) | 663 | if (!revised_text.empty()) |
663 | { | 664 | { |