From c9da4d0a6dccbdcff228a5841d224463bc45297c Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 27 Jun 2012 15:55:09 -0700 Subject: CHUI-162 : Simplified the nearby chat show method following CHUI-139 fixes --- indra/newview/llnearbychat.cpp | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'indra') diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index ee7169b1c3..a81d6b4025 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -397,23 +397,11 @@ LLNearbyChat* LLNearbyChat::getInstance() void LLNearbyChat::show() { - // Get the floater - LLNearbyChat* floater = LLNearbyChat::getInstance(); - if (floater) + if (isChatMultiTab()) { - if(isChatMultiTab()) - { - LLIMFloaterContainer* floater_container = LLIMFloaterContainer::getInstance(); - - // Add a conversation list item in the left pane: nothing will be done if already in there - // but relevant clean up will be done to ensure consistency of the conversation list - floater_container->addConversationListItem(floater->getTitle(), LLUUID(), floater); - - floater->openFloater(floater->getKey()); - } - - floater->setVisible(TRUE); + openFloater(getKey()); } + setVisible(TRUE); } void LLNearbyChat::showHistory() -- cgit v1.2.3