summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaximbproductengine <maximbproductengine@lindenlab.com>2013-01-10 13:41:47 +0200
committermaximbproductengine <maximbproductengine@lindenlab.com>2013-01-10 13:41:47 +0200
commitbad4eda43677d26b88c86f4381c6a0f7436f0daf (patch)
tree2ced0ec012cc33aa552bb41af96aec0848f87b4f
parent3cf2d8e9eac215024bc216958b0920e61aa25de1 (diff)
CHUI-663 (Right click menus on participants inactive in conversation floater for torn off conversation)
-rw-r--r--indra/newview/llfloaterimcontainer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index 82563b8736..a21cbf2bb2 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -906,7 +906,7 @@ const LLConversationItem * LLFloaterIMContainer::getCurSelectedViewModelItem()
mConversationsRoot->getCurSelectedItem()->getViewModelItem())
{
LLFloaterIMSessionTab *selected_session_floater = LLFloaterIMSessionTab::getConversation(mSelectedSession);
- if (selected_session_floater && !selected_session_floater->getHost())
+ if (selected_session_floater && !selected_session_floater->getHost() && selected_session_floater->getCurSelectedViewModelItem())
{
conversation_item = selected_session_floater->getCurSelectedViewModelItem();
}