diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-06-27 15:55:09 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-06-27 15:55:09 -0700 |
| commit | c9da4d0a6dccbdcff228a5841d224463bc45297c (patch) | |
| tree | 3a9be688af2cdd90f3ee6120c5144088c530a3eb | |
| parent | ea77a959b760fa44b55ed7ff18ac6b8e8642f44d (diff) | |
CHUI-162 : Simplified the nearby chat show method following CHUI-139 fixes
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 18 |
1 files changed, 3 insertions, 15 deletions
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() |