summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorCho <cho@lindenlab.com>2013-01-30 02:54:59 +0000
committerCho <cho@lindenlab.com>2013-01-30 02:54:59 +0000
commit4f0237007a3a21cc502a1a15b0530bceaf5217db (patch)
tree56efb1a7ac58dc6cf4563f49de0547fad34e765d /indra/newview
parentacd28e28bc6ff48789ba321a470f05f7162ddd46 (diff)
CHUI-647 FIX "Conversations" floater is not opened when user wants to share something via "Conversation log" floater
Added call to show conversations floater in LLAvatarActions::share
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llavataractions.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 83b2888ca8..d6e457887b 100755
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -443,6 +443,7 @@ void LLAvatarActions::share(const LLUUID& id)
{
LLSD key;
LLFloaterSidePanelContainer::showPanel("inventory", key);
+ LLFloaterReg::showInstance("im_container");
LLUUID session_id = gIMMgr->computeSessionID(IM_NOTHING_SPECIAL,id);