From 452832b26f0d4c4e94da7ebd9b98f2fc337950c3 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Wed, 12 Jun 2013 15:05:15 +0300 Subject: CHUI-976 FIXED Correct way to show Nearby chat is used now. --- indra/newview/llchatitemscontainerctrl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llchatitemscontainerctrl.cpp') diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp index a1a9463d43..46fd7996d4 100755 --- a/indra/newview/llchatitemscontainerctrl.cpp +++ b/indra/newview/llchatitemscontainerctrl.cpp @@ -323,12 +323,12 @@ BOOL LLFloaterIMNearbyChatToastPanel::handleMouseUp (S32 x, S32 y, MASK mask) return TRUE; else { - (LLFloaterReg::getTypedInstance("nearby_chat"))->showHistory(); + LLFloaterReg::toggleInstanceOrBringToFront("nearby_chat"); return FALSE; } } - (LLFloaterReg::getTypedInstance("nearby_chat"))->showHistory(); + LLFloaterReg::toggleInstanceOrBringToFront("nearby_chat"); return LLPanel::handleMouseUp(x,y,mask); } -- cgit v1.2.3 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 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'indra/newview/llchatitemscontainerctrl.cpp') 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); } -- cgit v1.2.3