From 9da29e2ccc9d51553434ff6975287602420ac08f Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Wed, 26 Jun 2013 19:23:00 +0300 Subject: CHUI-983 FIXED Call showHistory() after clicking toast as it was before. Minor change in showHistory() --- indra/newview/llchatitemscontainerctrl.cpp | 5 ++--- indra/newview/llfloaterimnearbychat.cpp | 6 ++++++ 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'indra') diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp index 46fd7996d4..fd4f17b694 100755 --- a/indra/newview/llchatitemscontainerctrl.cpp +++ b/indra/newview/llchatitemscontainerctrl.cpp @@ -323,12 +323,11 @@ BOOL LLFloaterIMNearbyChatToastPanel::handleMouseUp (S32 x, S32 y, MASK mask) return TRUE; else { - LLFloaterReg::toggleInstanceOrBringToFront("nearby_chat"); + LLFloaterReg::getTypedInstance("nearby_chat")->showHistory(); return FALSE; } } - - LLFloaterReg::toggleInstanceOrBringToFront("nearby_chat"); + LLFloaterReg::getTypedInstance("nearby_chat")->showHistory(); return LLPanel::handleMouseUp(x,y,mask); } diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp index 6bb3caadb9..59593d776b 100755 --- a/indra/newview/llfloaterimnearbychat.cpp +++ b/indra/newview/llfloaterimnearbychat.cpp @@ -350,11 +350,17 @@ bool LLFloaterIMNearbyChat::isChatVisible() const void LLFloaterIMNearbyChat::showHistory() { openFloater(); + LLFloaterIMContainer::getInstance()->selectConversation(LLUUID(NULL)); + if(!isMessagePaneExpanded()) { restoreFloater(); setFocus(true); } + else + { + LLFloaterIMContainer::getInstance()->setFocus(TRUE); + } setResizeLimits(getMinWidth(), EXPANDED_MIN_HEIGHT); } -- cgit v1.2.3