diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llconversationmodel.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llimfloatercontainer.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_conversation.xml | 36 |
3 files changed, 29 insertions, 19 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); 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; diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml index bf834ee9ff..912ff811d9 100644 --- a/indra/newview/skins/default/xui/en/menu_conversation.xml +++ b/indra/newview/skins/default/xui/en/menu_conversation.xml @@ -26,24 +26,6 @@ </menu_item_call> <menu_item_separator layout="topleft" name="separator_disconnect_from_voice"/> <menu_item_call - label="Group Profile" - layout="topleft" - name="group_profile"> - <on_click function="Group.DoToSelected" parameter="group_profile"/> - </menu_item_call> - <menu_item_call - label="Activate Group" - layout="topleft" - name="activate_group"> - <on_click function="Group.DoToSelected" parameter="activate_group"/> - </menu_item_call> - <menu_item_call - label="Leave Group" - layout="topleft" - name="leave_group"> - <on_click function="Group.DoToSelected" parameter="leave_group"/> - </menu_item_call> - <menu_item_call label="View Profile" layout="topleft" name="view_profile"> @@ -124,4 +106,22 @@ <on_check function="Avatar.CheckItem" parameter="is_blocked" /> <on_enable function="Avatar.EnableItem" parameter="can_block" /> </menu_item_check> + <menu_item_call + label="Group Profile" + layout="topleft" + name="group_profile"> + <on_click function="Group.DoToSelected" parameter="group_profile"/> + </menu_item_call> + <menu_item_call + label="Activate Group" + layout="topleft" + name="activate_group"> + <on_click function="Group.DoToSelected" parameter="activate_group"/> + </menu_item_call> + <menu_item_call + label="Leave Group" + layout="topleft" + name="leave_group"> + <on_click function="Group.DoToSelected" parameter="leave_group"/> + </menu_item_call> </toggleable_menu> |