From b29f05217a841b7323434a40595cc5cf53846ce9 Mon Sep 17 00:00:00 2001 From: ziree Date: Wed, 28 Sep 2011 19:55:32 +0200 Subject: [PATCH] Make overlay chat bar hide on send even if close on chat is not selected. --- indra/newview/llchatbar.cpp | 2 +- indra/newview/llnearbychatbar.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp index 8b8cd47f40..6bee0629f1 100644 --- a/indra/newview/llchatbar.cpp +++ b/indra/newview/llchatbar.cpp @@ -484,7 +484,7 @@ void LLChatBar::sendChat( EChatType type ) // If the user wants to stop chatting on hitting return, lose focus // and go out of chat mode. - if (gChatBar == this && gSavedSettings.getBOOL("CloseChatOnReturn")) + if (gChatBar == this && (gSavedSettings.getBOOL("CloseChatOnReturn") || gSavedSettings.getBOOL("AutohideChatBar"))) { stopChat(); } diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp index 86879d580d..812959b111 100644 --- a/indra/newview/llnearbychatbar.cpp +++ b/indra/newview/llnearbychatbar.cpp @@ -784,7 +784,7 @@ void LLNearbyChatBar::sendChat( EChatType type ) // If the user wants to stop chatting on hitting return, lose focus // and go out of chat mode. - if (gSavedSettings.getBOOL("CloseChatOnReturn")) + if (gSavedSettings.getBOOL("CloseChatOnReturn") || gSavedSettings.getBOOL("AutohideChatBar")) { stopChat(); }