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

MAINT-3068 FIXED "Request Teleport" menu item is added to context menu.

meow-7.2.2
Mnikolenko ProductEngine 2013-11-12 14:51:43 +02:00
parent 3661748a2c
commit 44eaa10b80
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llchathistory.cpp
View File

@ -187,6 +187,10 @@ public:
{
LLAvatarActions::offerTeleport(getAvatarId());
}
else if (level == "request_teleport")
{
LLAvatarActions::teleportRequest(getAvatarId());
}
else if (level == "voice_call")
{
LLAvatarActions::startCall(getAvatarId());
@ -547,6 +551,7 @@ protected:
menu->setItemEnabled("Send IM", false);
menu->setItemEnabled("Remove Friend", false);
menu->setItemEnabled("Offer Teleport",false);
menu->setItemEnabled("Request Teleport",false);
menu->setItemEnabled("Voice Call", false);
menu->setItemEnabled("Chat History", false);
menu->setItemEnabled("Invite Group", false);
@ -564,6 +569,7 @@ protected:
menu->setItemVisible("Send IM", false);
}
menu->setItemEnabled("Offer Teleport", LLAvatarActions::canOfferTeleport(mAvatarID));
menu->setItemEnabled("Request Teleport", LLAvatarActions::canOfferTeleport(mAvatarID));
menu->setItemEnabled("Voice Call", LLAvatarActions::canCall());
// We should only show 'Zoom in' item in a nearby chat

6
indra/newview/skins/default/xui/en/menu_avatar_icon.xml
View File

@ -30,6 +30,12 @@
name="Offer Teleport">
<on_click function="AvatarIcon.Action" parameter="teleport"/>
</menu_item_call>
<menu_item_call
label="Request Teleport"
layout="topleft"
name="Request Teleport">
<on_click function="AvatarIcon.Action" parameter="request_teleport"/>
</menu_item_call>
<menu_item_call
label="Voice call"
layout="topleft"