summaryrefslogtreecommitdiff
path: root/indra/newview/llimfloatercontainer.cpp
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-10-02 17:03:46 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2012-10-02 17:03:46 -0700
commited9ade7d50b699ac60eb69a979ea32a60eefa630 (patch)
treebc1db90272cfc5857c3af78d364f2a78dd3473e2 /indra/newview/llimfloatercontainer.cpp
parent9d989feede2dbef934cdc459b4758c024df862d6 (diff)
CHUI-102: Now the options menu (right-click menu) for a participant/conversation will open the 'Chat history' dialog when selected.
Diffstat (limited to 'indra/newview/llimfloatercontainer.cpp')
-rw-r--r--indra/newview/llimfloatercontainer.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp
index 7130926212..11aecde6e2 100644
--- a/indra/newview/llimfloatercontainer.cpp
+++ b/indra/newview/llimfloatercontainer.cpp
@@ -768,6 +768,10 @@ void LLIMFloaterContainer::doToUsers(const std::string& command, uuid_vec_t sele
{
LLAvatarActions::startCall(userID);
}
+ else if("chat_history" == command)
+ {
+ LLAvatarActions::viewChatHistory(userID);
+ }
else if("add_friend" == command)
{
LLAvatarActions::requestFriendshipDialog(userID);
@@ -836,6 +840,10 @@ void LLIMFloaterContainer::doToSelectedConversation(const std::string& command)
{
gIMMgr->endCall(conversationItem->getUUID());
}
+ else if("chat_history" == command)
+ {
+ LLAvatarActions::viewChatHistory(conversationItem->getUUID());
+ }
else
{
uuid_vec_t selected_uuids;