From b20e7dcb7221a949318f0dbe3084f82b3f8d6173 Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Mon, 15 Feb 2010 18:53:17 +0200 Subject: fixed EXT-5429 IM chat history of active tab in IM container is not updated when IM container is unminimized --HG-- branch : product-engine --- indra/newview/llimfloatercontainer.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'indra/newview/llimfloatercontainer.cpp') diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index 49521b5987..a775115ac9 100644 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -145,4 +145,16 @@ LLIMFloaterContainer* LLIMFloaterContainer::getInstance() return LLFloaterReg::getTypedInstance("im_container"); } +void LLIMFloaterContainer::setMinimized(BOOL b) +{ + LLMultiFloater::setMinimized(b); + + if (isMinimized()) return; + + if (getActiveFloater()) + { + getActiveFloater()->setVisible(TRUE); + } +} + // EOF -- cgit v1.2.3 From 41c8ad6efe5ec98a3196c047ea0e4ed2a9ee93bf Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Tue, 16 Feb 2010 10:47:29 +0200 Subject: additional fix for reopened EXT-5429 IM chat history of active tab in IM container is not updated when IM container is unminimized --HG-- branch : product-engine --- indra/newview/llimfloatercontainer.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llimfloatercontainer.cpp') diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index a775115ac9..3c6692b79a 100644 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -147,6 +147,8 @@ LLIMFloaterContainer* LLIMFloaterContainer::getInstance() void LLIMFloaterContainer::setMinimized(BOOL b) { + if (isMinimized() == b) return; + LLMultiFloater::setMinimized(b); if (isMinimized()) return; -- cgit v1.2.3 From 59e93da87b90acfc51404bac91ca3dc601716c8e Mon Sep 17 00:00:00 2001 From: Paul Guslisty Date: Tue, 16 Feb 2010 10:58:50 +0200 Subject: Fixed major bug EXT - 5400 (erroneously blinking IM tab on group chat message) --HG-- branch : product-engine --- indra/newview/llimfloatercontainer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llimfloatercontainer.cpp') diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index 3c6692b79a..2f248f3596 100644 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -110,8 +110,8 @@ void LLIMFloaterContainer::addFloater(LLFloater* floaterp, icon_params.avatar_id = avatar_id; icon = LLUICtrlFactory::instance().createWidget(icon_params); - mSessions[avatar_id] = floaterp; - floaterp->mCloseSignal.connect(boost::bind(&LLIMFloaterContainer::onCloseFloater, this, avatar_id)); + mSessions[session_id] = floaterp; + floaterp->mCloseSignal.connect(boost::bind(&LLIMFloaterContainer::onCloseFloater, this, session_id)); } mTabContainer->setTabImage(floaterp, icon); } @@ -123,7 +123,7 @@ void LLIMFloaterContainer::onCloseFloater(LLUUID& id) void LLIMFloaterContainer::onNewMessageReceived(const LLSD& data) { - LLUUID session_id = data["from_id"].asUUID(); + LLUUID session_id = data["session_id"].asUUID(); LLFloater* floaterp = get_ptr_in_map(mSessions, session_id); LLFloater* current_floater = LLMultiFloater::getActiveFloater(); -- cgit v1.2.3 From 2ab4bf8b35bed067a1e7871e921e489fdc8322aa Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Wed, 17 Feb 2010 15:22:39 +0200 Subject: =?UTF-8?q?fixed=20EXT-5378=20=E2=80=9CTransient=20exception=20man?= =?UTF-8?q?ager=20doesn't=20work=20if=20switch=20to=20tabbed=20IM=20window?= =?UTF-8?q?=E2=80=9D,=20added=20side=20tray=20tab=20to=20global=20group=20?= =?UTF-8?q?of=20transient=20exception=20list;=20added=20LLIMFloaterContain?= =?UTF-8?q?er=20to=20IM=20group=20of=20transient=20exception=20list;=20mad?= =?UTF-8?q?e=20VCP=20belongs=20to=20IM=20transient=20group;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : product-engine --- indra/newview/llimfloatercontainer.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'indra/newview/llimfloatercontainer.cpp') diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index 2f248f3596..db7998fe6e 100644 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -39,6 +39,7 @@ #include "llavatariconctrl.h" #include "llgroupiconctrl.h" #include "llagent.h" +#include "lltransientfloatermgr.h" // // LLIMFloaterContainer @@ -47,9 +48,13 @@ LLIMFloaterContainer::LLIMFloaterContainer(const LLSD& seed) : LLMultiFloater(seed) { mAutoResize = FALSE; + LLTransientFloaterMgr::getInstance()->addControlView(LLTransientFloaterMgr::IM, this); } -LLIMFloaterContainer::~LLIMFloaterContainer(){} +LLIMFloaterContainer::~LLIMFloaterContainer() +{ + LLTransientFloaterMgr::getInstance()->removeControlView(LLTransientFloaterMgr::IM, this); +} BOOL LLIMFloaterContainer::postBuild() { -- cgit v1.2.3