summaryrefslogtreecommitdiff
path: root/indra/newview/llnearbychathandler.cpp
diff options
context:
space:
mode:
authorAlexanderP ProductEngine <apaschenko@productengine.com>2012-06-14 20:00:41 +0300
committerAlexanderP ProductEngine <apaschenko@productengine.com>2012-06-14 20:00:41 +0300
commit51a39b5ac6465238178363f3ec3143dae4f73919 (patch)
treee4b7502b0a4b8ccb7c498e0c22f4c295e8315697 /indra/newview/llnearbychathandler.cpp
parent569146f27c7350ca2245f1fa7bc4cb9c16a428ea (diff)
CHUI-199 WIP Modified the nearby chat for using floater_im_session.xml; merging LLNearbyChatBar with LLNearbyChat;
clean up code; supressed a double creation of LLNearbyChat
Diffstat (limited to 'indra/newview/llnearbychathandler.cpp')
-rw-r--r--indra/newview/llnearbychathandler.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp
index e91a3fc334..c97e3585e1 100644
--- a/indra/newview/llnearbychathandler.cpp
+++ b/indra/newview/llnearbychathandler.cpp
@@ -555,7 +555,6 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg,
// Send event on to LLEventStream
sChatWatcher->post(chat);
-
if( nearby_chat->isInVisibleChain()
|| ( chat_msg.mSourceType == CHAT_SOURCE_AGENT
&& gSavedSettings.getBOOL("UseChatBubbles") )