Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Web Profile option to calling card inventory menu

Browse Source 
Only shown when web profiles are available and web profiles aren't used by default
This commit is contained in:
Inusaito Sayori
2013-08-27 21:37:08 -04:00
parent 27480c1718
commit 9df7808dc8
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llinventorybridge.cpp
View File

@@ -4642,6 +4642,13 @@ void LLCallingCardBridge::performAction(LLInventoryModel* model, std::string act
LLAvatarActions::teleportRequest(item->getCreatorUUID());
}
}
else if ("web_profile" == action)
{
if (LLViewerInventoryItem* item = getItem())
{
LLAvatarActions::showProfile(item->getCreatorUUID(), true);
}
}
else LLItemBridge::performAction(model, action);
}
@@ -4724,6 +4731,8 @@ void LLCallingCardBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
user_online = (LLAvatarTracker::instance().isBuddyOnline(item->getCreatorUUID()));
}
items.push_back(std::string("Send Instant Message Separator"));
if (!gSavedSettings.getString("WebProfileURL").empty() && !gSavedSettings.getBOOL("UseWebProfiles"))
items.push_back(std::string("Web Profile"));
items.push_back(std::string("Send Instant Message"));
items.push_back(std::string("Offer Teleport..."));
items.push_back(std::string("Request Teleport..."));

3
indra/newview/skins/default/xui/en-us/menu_inventory.xml
View File

@@ -273,6 +273,9 @@
<on_click filter="" function="Inventory.DoToSelected" userdata="playlocal" />
</menu_item_call>
<menu_item_separator name="Send Instant Message Separator" />
<menu_item_call label="Web Profile" name="Web Profile">
<on_click function="Inventory.DoToSelected" userdata="web_profile"/>
</menu_item_call>
<menu_item_call bottom_delta="-18" height="18" label="Send Instant Message" left="0"
mouse_opaque="true" name="Send Instant Message" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="begin_im" />