summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaksymsproductengine <maksymsproductengine@lindenlab.com>2012-10-08 15:19:00 +0300
committermaksymsproductengine <maksymsproductengine@lindenlab.com>2012-10-08 15:19:00 +0300
commit698cfc2811a6ce976a153a1a0d87d31c56dd52ec (patch)
tree03bd71b97b415d698168269f8f90e9908c934778
parentdb452823e5cc615225f3f163d827954447cf9bd8 (diff)
CHUI-390 FIXED Selecting Chat History option from right click menu on a conversation name does not open chat history viewer
-rw-r--r--indra/newview/llimfloatercontainer.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp
index 7c5aaa7d0f..94e7f1000b 100644
--- a/indra/newview/llimfloatercontainer.cpp
+++ b/indra/newview/llimfloatercontainer.cpp
@@ -888,7 +888,13 @@ void LLIMFloaterContainer::doToSelectedConversation(const std::string& command,
}
else if("chat_history" == command)
{
- LLAvatarActions::viewChatHistory(conversationItem->getUUID());
+ const LLIMModel::LLIMSession* session = LLIMModel::getInstance()->findIMSession(conversationItem->getUUID());
+
+ if (NULL != session)
+ {
+ const LLUUID session_id = session->isOutgoingAdHoc() ? session->generateOutgouigAdHocHash() : session->mSessionID;
+ LLFloaterReg::showInstance("preview_conversation", session_id, true);
+ }
}
else
{