summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2014-05-06 11:28:13 +0300
committermaxim_productengine <mnikolenko@productengine.com>2014-05-06 11:28:13 +0300
commit849ce1e30c080d71e4af8dc8f24720274a126f4c (patch)
treef08da9ea461ad112c1cb0b84d095a775f290ae4c
parentca967ce0a2e8fe6831c7e3496b786b07c0aef704 (diff)
MAINT-423 FIXED Unminimize session floater and select this session when sharing initiated.
-rwxr-xr-xindra/newview/llavataractions.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 54b9336d93..0d22c15b4f 100755
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -525,6 +525,14 @@ void LLAvatarActions::share(const LLUUID& id)
{
// we should always get here, but check to verify anyways
LLIMModel::getInstance()->addMessage(session_id, SYSTEM_FROM, LLUUID::null, LLTrans::getString("share_alert"), false);
+
+ LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::findConversation(session_id);
+ if (session_floater && session_floater->isMinimized())
+ {
+ session_floater->setMinimized(false);
+ }
+ LLFloaterIMContainer *im_container = LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container");
+ im_container->selectConversationPair(session_id, true);
}
}