summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2012-08-09 14:42:35 +0300
committermaxim_productengine <mnikolenko@productengine.com>2012-08-09 14:42:35 +0300
commit66391be51338e766ee0724aa06ef8f022269e0a3 (patch)
treecd4ca4f8f6843b6ba16683b427b4ef6cc1a9d147 /indra
parent160c6d4d3baa3b7402a1efc1e779d2306ee906a2 (diff)
MAINT-967 FIXED Use stopChat() even if Chat box is empty
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llnearbychatbar.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp
index 7f8fea88d2..c00dc4bc89 100644
--- a/indra/newview/llnearbychatbar.cpp
+++ b/indra/newview/llnearbychatbar.cpp
@@ -395,12 +395,6 @@ void LLNearbyChatBar::sendChat( EChatType type )
gAgent.stopTyping();
- // If the user wants to stop chatting on hitting return, lose focus
- // and go out of chat mode.
- if (gSavedSettings.getBOOL("CloseChatOnReturn"))
- {
- stopChat();
- }
}
void LLNearbyChatBar::showNearbyChatPanel(bool show)
@@ -451,7 +445,12 @@ void LLNearbyChatBar::onChatBoxCommit()
{
sendChat(CHAT_TYPE_NORMAL);
}
-
+ // If the user wants to stop chatting on hitting return, lose focus
+ // and go out of chat mode.
+ if (gSavedSettings.getBOOL("CloseChatOnReturn"))
+ {
+ stopChat();
+ }
gAgent.stopTyping();
}