livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
maksymsproductengine 2012-09-27 20:09:22 +03:00
parent 6daf27cd0f
commit 483cbd74d7
5 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llavataractions.cpp
View File

@ -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 ========================================================================================
// static

5
indra/newview/llavataractions.h
View File

@ -218,6 +218,11 @@ public:
*/
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();
private:

1
indra/newview/llpanelpeoplemenus.cpp
View File

@ -69,6 +69,7 @@ LLContextMenu* NearbyMenu::createMenu()
registrar.add("Avatar.Pay", boost::bind(&LLAvatarActions::pay, id));
registrar.add("Avatar.BlockUnblock", boost::bind(&LLAvatarActions::toggleBlock, 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.CheckItem", boost::bind(&NearbyMenu::checkContextMenuItem, this, _2));

8
indra/newview/skins/default/xui/en/menu_people_friends_view.xml
View File

@ -40,4 +40,12 @@
function="CheckControl"
parameter="FriendsListShowPermissions" />
</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>

10
indra/newview/skins/default/xui/en/menu_people_nearby.xml
View File

@ -36,6 +36,14 @@
parameter="can_call" />
</menu_item_call>
<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
label="Add Friend"
layout="topleft"
@ -101,5 +109,5 @@
function="Avatar.EnableItem"
parameter="can_block" />
</menu_item_check>
<menu_item_separator />
</context_menu>