Skip to content
Snippets Groups Projects
Commit 483cbd74 authored by maksymsproductengine's avatar maksymsproductengine
Browse files

CHUI-165 FIXED Add access to Conversation Log and Chat History from the People floater.

parent 6daf27cd
Branches
Tags
No related merge requests found
...@@ -897,6 +897,12 @@ void LLAvatarActions::inviteToGroup(const LLUUID& id) ...@@ -897,6 +897,12 @@ void LLAvatarActions::inviteToGroup(const LLUUID& id)
} }
} }
// static
void LLAvatarActions::viewChatHistory(const LLUUID& id)
{
LLFloaterReg::showInstance("preview_conversation", id, true);
}
//== private methods ======================================================================================== //== private methods ========================================================================================
// static // static
......
...@@ -218,6 +218,11 @@ class LLAvatarActions ...@@ -218,6 +218,11 @@ class LLAvatarActions
*/ */
static void buildResidentsString(const std::vector<LLAvatarName> avatar_names, std::string& residents_string); static void buildResidentsString(const std::vector<LLAvatarName> avatar_names, std::string& residents_string);
/**
* Opens the chat history for avatar
*/
static void viewChatHistory(const LLUUID& id);
static std::set<LLUUID> getInventorySelectedUUIDs(); static std::set<LLUUID> getInventorySelectedUUIDs();
private: private:
......
...@@ -69,6 +69,7 @@ LLContextMenu* NearbyMenu::createMenu() ...@@ -69,6 +69,7 @@ LLContextMenu* NearbyMenu::createMenu()
registrar.add("Avatar.Pay", boost::bind(&LLAvatarActions::pay, id)); registrar.add("Avatar.Pay", boost::bind(&LLAvatarActions::pay, id));
registrar.add("Avatar.BlockUnblock", boost::bind(&LLAvatarActions::toggleBlock, id)); registrar.add("Avatar.BlockUnblock", boost::bind(&LLAvatarActions::toggleBlock, id));
registrar.add("Avatar.InviteToGroup", boost::bind(&LLAvatarActions::inviteToGroup, id)); registrar.add("Avatar.InviteToGroup", boost::bind(&LLAvatarActions::inviteToGroup, id));
registrar.add("Avatar.Calllog", boost::bind(&LLAvatarActions::viewChatHistory, id));
enable_registrar.add("Avatar.EnableItem", boost::bind(&NearbyMenu::enableContextMenuItem, this, _2)); enable_registrar.add("Avatar.EnableItem", boost::bind(&NearbyMenu::enableContextMenuItem, this, _2));
enable_registrar.add("Avatar.CheckItem", boost::bind(&NearbyMenu::checkContextMenuItem, this, _2)); enable_registrar.add("Avatar.CheckItem", boost::bind(&NearbyMenu::checkContextMenuItem, this, _2));
......
...@@ -40,4 +40,12 @@ ...@@ -40,4 +40,12 @@
function="CheckControl" function="CheckControl"
parameter="FriendsListShowPermissions" /> parameter="FriendsListShowPermissions" />
</menu_item_check> </menu_item_check>
<menu_item_check name="view_conversation" label="View Conversation Log...">
<menu_item_check.on_check
function="Floater.Visible"
parameter="conversation" />
<menu_item_check.on_click
function="Floater.Toggle"
parameter="conversation" />
</menu_item_check>
</toggleable_menu> </toggleable_menu>
...@@ -36,6 +36,14 @@ ...@@ -36,6 +36,14 @@
parameter="can_call" /> parameter="can_call" />
</menu_item_call> </menu_item_call>
<menu_item_separator /> <menu_item_separator />
<menu_item_call
label="View chat history..."
layout="topleft"
name="Chat history">
<menu_item_call.on_click
function="Avatar.Calllog" />
</menu_item_call>
<menu_item_separator />
<menu_item_call <menu_item_call
label="Add Friend" label="Add Friend"
layout="topleft" layout="topleft"
...@@ -101,5 +109,5 @@ ...@@ -101,5 +109,5 @@
function="Avatar.EnableItem" function="Avatar.EnableItem"
parameter="can_block" /> parameter="can_block" />
</menu_item_check> </menu_item_check>
<menu_item_separator />
</context_menu> </context_menu>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment