summaryrefslogtreecommitdiff
path: root/indra/newview/llconversationmodel.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/llconversationmodel.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/llconversationmodel.cpp')
-rw-r--r--indra/newview/llconversationmodel.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp
index a3ec154ac6..5fc305da81 100644
--- a/indra/newview/llconversationmodel.cpp
+++ b/indra/newview/llconversationmodel.cpp
@@ -226,7 +226,8 @@ void LLConversationItemSession::buildContextMenu(LLMenuGL& menu, U32 flags)
{
items.push_back(std::string("close_conversation"));
addVoiceOptions(items);
- items.push_back(std::string("separator_disconnect_from_voice"));
+ items.push_back(std::string("chat_history"));
+ items.push_back(std::string("separator_chat_history"));
items.push_back(std::string("group_profile"));
items.push_back(std::string("activate_group"));
items.push_back(std::string("leave_group"));
@@ -235,6 +236,7 @@ void LLConversationItemSession::buildContextMenu(LLMenuGL& menu, U32 flags)
{
items.push_back(std::string("close_conversation"));
addVoiceOptions(items);
+ items.push_back(std::string("chat_history"));
}
hide_context_entries(menu, items, disabled_items);