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

Partial EXT-3268 Object Profile option showing up in avatar 3D Context menu 

Renamed gPie* and menu_pie_* to just gMenu* and menu_* because they are no
longer pie menus.  Created separate other-attachment menus.
Reviewed with Richard.
meow-7.2.2
James Cook 2009-12-09 16:37:08 -08:00
parent 418f30d1cd
commit dab87201cd
10 changed files with 883 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
indra/newview/llselectmgr.cpp
View File

@ -3494,7 +3494,7 @@ void LLSelectMgr::deselectAllIfTooFar()
// HACK: Don't deselect when we're navigating to rate an object's
// owner or creator. JC
if (gPieObject->getVisible() || gPieRate->getVisible() )
if (gMenuObject->getVisible())
{
return;
}
@ -5493,11 +5493,15 @@ void dialog_refresh_all()
gFloaterTools->dirty();
gPieObject->needsArrange();
gMenuObject->needsArrange();
if( gPieAttachment->getVisible() )
if( gMenuAttachmentSelf->getVisible() )
{
gPieAttachment->arrange();
gMenuAttachmentSelf->arrange();
}
if( gMenuAttachmentOther->getVisible() )
{
gMenuAttachmentOther->arrange();
}
LLFloaterProperties::dirtyAll();
@ -5754,21 +5758,21 @@ void LLSelectMgr::redo()
//-----------------------------------------------------------------------------
BOOL LLSelectMgr::canDoDelete() const
{
bool can_delete = false;
// This function is "logically const" - it does not change state in
// a way visible outside the selection manager.
LLSelectMgr* self = const_cast<LLSelectMgr*>(this);
LLViewerObject* obj = self->mSelectedObjects->getFirstDeleteableObject();
// Note: Can only delete root objects (see getFirstDeleteableObject() for more info)
if (obj!= NULL)
{
// all the faces needs to be selected
if(self->mSelectedObjects->contains(obj,SELECT_ALL_TES ))
{
can_delete = true;
}
}
bool can_delete = false;
// This function is "logically const" - it does not change state in
// a way visible outside the selection manager.
LLSelectMgr* self = const_cast<LLSelectMgr*>(this);
LLViewerObject* obj = self->mSelectedObjects->getFirstDeleteableObject();
// Note: Can only delete root objects (see getFirstDeleteableObject() for more info)
if (obj!= NULL)
{
// all the faces needs to be selected
if(self->mSelectedObjects->contains(obj,SELECT_ALL_TES ))
{
can_delete = true;
}
}
return can_delete;
}

22
indra/newview/lltoolpie.cpp
View File

@ -1445,28 +1445,29 @@ BOOL LLToolPie::pickRightMouseDownCallback()
{
LLParcelSelectionHandle selection = LLViewerParcelMgr::getInstance()->selectParcelAt( mPick.mPosGlobal );
gMenuHolder->setParcelSelection(selection);
gPieLand->show(x, y);
gMenuLand->show(x, y);
showVisualContextMenuEffect();
}
else if (mPick.mObjectID == gAgent.getID() )
{
if(!gPieSelf)
if(!gMenuAvatarSelf)
{
//either at very early startup stage or at late quitting stage,
//this event is ignored.
return TRUE ;
}
gPieSelf->show(x, y);
gMenuAvatarSelf->show(x, y);
}
else if (object)
{
gMenuHolder->setObjectSelection(LLSelectMgr::getInstance()->getSelection());
bool is_other_attachment = (object->isAttachment() && !object->isHUDAttachment() && !object->permYouOwner());
if (object->isAvatar()
|| (object->isAttachment() && !object->isHUDAttachment() && !object->permYouOwner()))
|| is_other_attachment)
{
// Find the attachment's avatar
while( object && object->isAttachment())
@ -1486,11 +1487,18 @@ BOOL LLToolPie::pickRightMouseDownCallback()
gMenuHolder->childSetText("Avatar Mute", std::string("Mute")); // *TODO:Translate
}
gPieAvatar->show(x, y);
if (is_other_attachment)
{
gMenuAttachmentOther->show(x, y);
}
else
{
gMenuAvatarOther->show(x, y);
}
}
else if (object->isAttachment())
{
gPieAttachment->show(x, y);
gMenuAttachmentSelf->show(x, y);
}
else
{
@ -1510,7 +1518,7 @@ BOOL LLToolPie::pickRightMouseDownCallback()
gMenuHolder->childSetText("Object Mute", std::string("Mute")); // *TODO:Translate
}
gPieObject->show(x, y);
gMenuObject->show(x, y);
showVisualContextMenuEffect();
}

76
indra/newview/llviewermenu.cpp
View File

@ -133,11 +133,12 @@ LLMenuGL *gPopupMenuView = NULL;
LLMenuBarGL *gLoginMenuBarView = NULL;
// Pie menus
LLContextMenu *gPieSelf = NULL;
LLContextMenu *gPieAvatar = NULL;
LLContextMenu *gPieObject = NULL;
LLContextMenu *gPieAttachment = NULL;
LLContextMenu *gPieLand = NULL;
LLContextMenu *gMenuAvatarSelf = NULL;
LLContextMenu *gMenuAvatarOther = NULL;
LLContextMenu *gMenuObject = NULL;
LLContextMenu *gMenuAttachmentSelf = NULL;
LLContextMenu *gMenuAttachmentOther = NULL;
LLContextMenu *gMenuLand = NULL;
const std::string SAVE_INTO_INVENTORY("Save Object Back to My Inventory");
const std::string SAVE_INTO_TASK_INVENTORY("Save Object Back to Object Contents");
@ -145,7 +146,6 @@ const std::string SAVE_INTO_TASK_INVENTORY("Save Object Back to Object Contents"
LLMenuGL* gAttachSubMenu = NULL;
LLMenuGL* gDetachSubMenu = NULL;
LLMenuGL* gTakeOffClothes = NULL;
LLContextMenu* gPieRate = NULL;
LLContextMenu* gAttachScreenPieMenu = NULL;
LLContextMenu* gAttachPieMenu = NULL;
LLContextMenu* gAttachBodyPartPieMenus[8];
@ -375,25 +375,31 @@ void init_menus()
gMenuHolder->addChild( gPopupMenuView );
///
/// Pie menus
/// Context menus
///
gPieSelf = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>("menu_pie_self.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
const widget_registry_t& registry =
LLViewerMenuHolderGL::child_registry_t::instance();
gMenuAvatarSelf = LLUICtrlFactory::createFromFile<LLContextMenu>(
"menu_avatar_self.xml", gMenuHolder, registry);
gMenuAvatarOther = LLUICtrlFactory::createFromFile<LLContextMenu>(
"menu_avatar_other.xml", gMenuHolder, registry);
// TomY TODO: what shall we do about these?
gDetachScreenPieMenu = gMenuHolder->getChild<LLContextMenu>("Object Detach HUD", true);
gDetachPieMenu = gMenuHolder->getChild<LLContextMenu>("Object Detach", true);
gPieAvatar = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>("menu_pie_avatar.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
gPieObject = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>("menu_pie_object.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
gMenuObject = LLUICtrlFactory::createFromFile<LLContextMenu>(
"menu_object.xml", gMenuHolder, registry);
gAttachScreenPieMenu = gMenuHolder->getChild<LLContextMenu>("Object Attach HUD");
gAttachPieMenu = gMenuHolder->getChild<LLContextMenu>("Object Attach");
gPieRate = gMenuHolder->getChild<LLContextMenu>("Rate Menu");
gPieAttachment = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>("menu_pie_attachment.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
gMenuAttachmentSelf = LLUICtrlFactory::createFromFile<LLContextMenu>(
"menu_attachment_self.xml", gMenuHolder, registry);
gMenuAttachmentOther = LLUICtrlFactory::createFromFile<LLContextMenu>(
"menu_attachment_other.xml", gMenuHolder, registry);
gPieLand = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>("menu_pie_land.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
gMenuLand = LLUICtrlFactory::createFromFile<LLContextMenu>(
"menu_land.xml", gMenuHolder, registry);
///
/// set up the colors
@ -402,12 +408,13 @@ void init_menus()
LLColor4 context_menu_color = LLUIColorTable::instance().getColor("MenuPopupBgColor");
gPieSelf->setBackgroundColor( context_menu_color );
gPieAvatar->setBackgroundColor( context_menu_color );
gPieObject->setBackgroundColor( context_menu_color );
gPieAttachment->setBackgroundColor( context_menu_color );
gMenuAvatarSelf->setBackgroundColor( context_menu_color );
gMenuAvatarOther->setBackgroundColor( context_menu_color );
gMenuObject->setBackgroundColor( context_menu_color );
gMenuAttachmentSelf->setBackgroundColor( context_menu_color );
gMenuAttachmentOther->setBackgroundColor( context_menu_color );
gPieLand->setBackgroundColor( context_menu_color );
gMenuLand->setBackgroundColor( context_menu_color );
color = LLUIColorTable::instance().getColor( "MenuPopupBgColor" );
gPopupMenuView->setBackgroundColor( color );
@ -2262,20 +2269,23 @@ void cleanup_menus()
delete gMenuParcelObserver;
gMenuParcelObserver = NULL;
delete gPieSelf;
gPieSelf = NULL;
delete gMenuAvatarSelf;
gMenuAvatarSelf = NULL;
delete gPieAvatar;
gPieAvatar = NULL;
delete gMenuAvatarOther;
gMenuAvatarOther = NULL;
delete gPieObject;
gPieObject = NULL;
delete gMenuObject;
gMenuObject = NULL;
delete gPieAttachment;
gPieAttachment = NULL;
delete gMenuAttachmentSelf;
gMenuAttachmentSelf = NULL;
delete gPieLand;
gPieLand = NULL;
delete gMenuAttachmentOther;
gMenuAttachmentSelf = NULL;
delete gMenuLand;
gMenuLand = NULL;
delete gMenuBarView;
gMenuBarView = NULL;
@ -4903,7 +4913,7 @@ class LLEditDelete : public view_listener_t
// When deleting an object we may not actually be done
// Keep selection so we know what to delete when confirmation is needed about the delete
gPieObject->hide();
gMenuObject->hide();
return true;
}
};
@ -4936,7 +4946,7 @@ void handle_object_delete()
// When deleting an object we may not actually be done
// Keep selection so we know what to delete when confirmation is needed about the delete
gPieObject->hide();
gMenuObject->hide();
return;
}
@ -6007,7 +6017,7 @@ public:
protected:
virtual void done()
{
gPieAttachment->buildDrawLabels();
gMenuAttachmentSelf->buildDrawLabels();
gInventory.removeObserver(this);
delete this;
}

22
indra/newview/llviewermenu.h
View File

@ -160,21 +160,13 @@ extern LLMenuGL* gPopupMenuView;
extern LLViewerMenuHolderGL* gMenuHolder;
extern LLMenuBarGL* gLoginMenuBarView;
// Pie menus
extern LLContextMenu *gPieSelf;
extern LLContextMenu *gPieAvatar;
extern LLContextMenu *gPieObject;
extern LLContextMenu *gPieAttachment;
extern LLContextMenu *gPieLand;
extern LLContextMenu *gPieRate;
// Pie menus
extern LLContextMenu *gPieSelfSimple;
extern LLContextMenu *gPieAvatarSimple;
extern LLContextMenu *gPieObjectSimple;
extern LLContextMenu *gPieAttachmentSimple;
extern LLContextMenu *gPieLandSimple;
// Context menus in 3D scene
extern LLContextMenu *gMenuAvatarSelf;
extern LLContextMenu *gMenuAvatarOther;
extern LLContextMenu *gMenuObject;
extern LLContextMenu *gMenuAttachmentSelf;
extern LLContextMenu *gMenuAttachmentOther;
extern LLContextMenu *gMenuLand;
// Needed to build menus when attachment site list available
extern LLMenuGL* gAttachSubMenu;

116
indra/newview/skins/default/xui/en/menu_attachment_other.xml Normal file
View File

@ -0,0 +1,116 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu
layout="topleft"
name="Avatar Pie">
<menu_item_call
label="View Profile"
layout="topleft"
name="Profile...">
<menu_item_call.on_click
function="ShowAgentProfile"
parameter="hit object" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Add Friend"
layout="topleft"
name="Add Friend">
<menu_item_call.on_click
function="Avatar.AddFriend" />
<menu_item_call.on_enable
function="Avatar.EnableAddFriend" />
</menu_item_call>
<menu_item_call
label="IM"
layout="topleft"
name="Send IM...">
<menu_item_call.on_click
function="Avatar.SendIM" />
</menu_item_call>
<menu_item_call
label="Call"
layout="topleft"
name="Call">
<menu_item_call.on_click
function="Avatar.Call" />
</menu_item_call>
<menu_item_call
label="Invite to Group"
layout="topleft"
name="Invite...">
<menu_item_call.on_click
function="Avatar.InviteToGroup" />
</menu_item_call>
<menu_item_separator
layout="topleft" />
<menu_item_call
enabled="false"
label="Block"
layout="topleft"
name="Avatar Mute">
<menu_item_call.on_click
function="Avatar.Mute" />
<menu_item_call.on_enable
function="Avatar.EnableMute" />
</menu_item_call>
<menu_item_call
label="Report"
layout="topleft"
name="abuse">
<menu_item_call.on_click
function="Avatar.ReportAbuse" />
</menu_item_call>
<menu_item_call
label="Freeze"
name="Freeze...">
<menu_item_call.on_click
function="Avatar.Freeze" />
<menu_item_call.on_visible
function="Avatar.EnableFreezeEject"/>
</menu_item_call>
<menu_item_call
label="Eject"
name="Eject...">
<menu_item_call.on_click
function="Avatar.Eject" />
<menu_item_call.on_visible
function="Avatar.EnableFreezeEject"/>
</menu_item_call>
<menu_item_call
label="Debug"
name="Debug...">
<menu_item_call.on_click
function="Avatar.Debug" />
<menu_item_call.on_visible
function="IsGodCustomerService"/>
</menu_item_call>
<menu_item_call
label="Zoom In"
layout="topleft"
name="Zoom In">
<menu_item_call.on_click
function="Tools.LookAtSelection"
parameter="zoom" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Pay"
layout="topleft"
name="Pay...">
<menu_item_call.on_click
function="PayObject" />
<menu_item_call.on_enable
function="EnablePayAvatar" />
</menu_item_call>
<menu_item_separator
layout="topleft" />
<menu_item_call
label="Object Profile"
layout="topleft"
name="Object Inspect">
<menu_item_call.on_click
function="Object.Inspect" />
<menu_item_call.on_enable
function="Object.EnableInspect" />
</menu_item_call>
</context_menu>

124
indra/newview/skins/default/xui/en/menu_attachment_self.xml Normal file
View File

@ -0,0 +1,124 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu
layout="topleft"
name="Attachment Pie">
<menu_item_call
enabled="false"
label="Touch"
layout="topleft"
name="Attachment Object Touch">
<menu_item_call.on_click
function="Object.Touch" />
<menu_item_call.on_enable
function="Object.EnableTouch"
name="EnableTouch"
parameter="Touch" />
</menu_item_call>
<!--menu_item_call
label="Stand Up"
layout="topleft"
name="Stand Up">
<menu_item_call.on_click
function="Self.StandUp"
parameter="" />
<menu_item_call.on_enable
function="Self.EnableStandUp" />
</menu_item_call-->
<menu_item_call
enabled="false"
label="Edit"
layout="topleft"
name="Edit...">
<menu_item_call.on_click
function="Object.Edit" />
<menu_item_call.on_enable
function="EnableEdit" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Detach"
layout="topleft"
name="Detach">
<menu_item_call.on_click
function="Attachment.Detach" />
<menu_item_call.on_enable
function="Attachment.EnableDetach" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Drop"
layout="topleft"
name="Drop">
<menu_item_call.on_click
function="Attachment.Drop" />
<menu_item_call.on_enable
function="Attachment.EnableDrop" />
</menu_item_call>
<!--menu_item_call
label="My Profile"
layout="topleft"
name="Profile...">
<menu_item_call.on_click
function="ShowAgentProfile"
parameter="agent" />
</menu_item_call>
<menu_item_call
label="My Appearance"
layout="topleft"
name="Appearance...">
<menu_item_call.on_click
function="ShowFloater"
parameter="appearance" />
<menu_item_call.on_enable
function="Edit.EnableCustomizeAvatar" />
</menu_item_call-->
<menu_item_separator
layout="topleft" />
<menu_item_call
label="Stand Up"
layout="topleft"
name="Stand Up">
<menu_item_call.on_click
function="Self.StandUp"
parameter="" />
<menu_item_call.on_enable
function="Self.EnableStandUp" />
</menu_item_call>
<menu_item_call
label="My Appearance"
layout="topleft"
name="Appearance...">
<menu_item_call.on_click
function="ShowFloater"
parameter="appearance" />
<menu_item_call.on_enable
function="Edit.EnableCustomizeAvatar" />
</menu_item_call>
<menu_item_call
label="My Friends"
layout="topleft"
name="Friends...">
<menu_item_call.on_click
function="SideTray.PanelPeopleTab"
parameter="friends_panel" />
</menu_item_call>
<menu_item_call
label="My Groups"
layout="topleft"
name="Groups...">
<menu_item_call.on_click
function="SideTray.PanelPeopleTab"
parameter="groups_panel" />
</menu_item_call>
<menu_item_call
label="My Profile"
layout="topleft"
name="Profile...">
<menu_item_call.on_click
function="ShowAgentProfile"
parameter="agent" />
</menu_item_call>
</context_menu>

105
indra/newview/skins/default/xui/en/menu_avatar_other.xml Normal file
View File

@ -0,0 +1,105 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu
layout="topleft"
name="Avatar Pie">
<menu_item_call
label="View Profile"
layout="topleft"
name="Profile...">
<menu_item_call.on_click
function="ShowAgentProfile"
parameter="hit object" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Add Friend"
layout="topleft"
name="Add Friend">
<menu_item_call.on_click
function="Avatar.AddFriend" />
<menu_item_call.on_enable
function="Avatar.EnableAddFriend" />
</menu_item_call>
<menu_item_call
label="IM"
layout="topleft"
name="Send IM...">
<menu_item_call.on_click
function="Avatar.SendIM" />
</menu_item_call>
<menu_item_call
label="Call"
layout="topleft"
name="Call">
<menu_item_call.on_click
function="Avatar.Call" />
</menu_item_call>
<menu_item_call
label="Invite to Group"
layout="topleft"
name="Invite...">
<menu_item_call.on_click
function="Avatar.InviteToGroup" />
</menu_item_call>
<menu_item_separator
layout="topleft" />
<menu_item_call
enabled="false"
label="Block"
layout="topleft"
name="Avatar Mute">
<menu_item_call.on_click
function="Avatar.Mute" />
<menu_item_call.on_enable
function="Avatar.EnableMute" />
</menu_item_call>
<menu_item_call
label="Report"
layout="topleft"
name="abuse">
<menu_item_call.on_click
function="Avatar.ReportAbuse" />
</menu_item_call>
<menu_item_call
label="Freeze"
name="Freeze...">
<menu_item_call.on_click
function="Avatar.Freeze" />
<menu_item_call.on_visible
function="Avatar.EnableFreezeEject"/>
</menu_item_call>
<menu_item_call
label="Eject"
name="Eject...">
<menu_item_call.on_click
function="Avatar.Eject" />
<menu_item_call.on_visible
function="Avatar.EnableFreezeEject"/>
</menu_item_call>
<menu_item_call
label="Debug"
name="Debug...">
<menu_item_call.on_click
function="Avatar.Debug" />
<menu_item_call.on_visible
function="IsGodCustomerService"/>
</menu_item_call>
<menu_item_call
label="Zoom In"
layout="topleft"
name="Zoom In">
<menu_item_call.on_click
function="Tools.LookAtSelection"
parameter="zoom" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Pay"
layout="topleft"
name="Pay...">
<menu_item_call.on_click
function="PayObject" />
<menu_item_call.on_enable
function="EnablePayAvatar" />
</menu_item_call>
</context_menu>

227
indra/newview/skins/default/xui/en/menu_avatar_self.xml Normal file
View File

@ -0,0 +1,227 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu
layout="topleft"
name="Self Pie">
<menu_item_call
label="Stand Up"
layout="topleft"
name="Stand Up">
<menu_item_call.on_click
function="Self.StandUp"
parameter="" />
<menu_item_call.on_enable
function="Self.EnableStandUp" />
</menu_item_call>
<context_menu
label="Take Off &gt;"
layout="topleft"
name="Take Off &gt;">
<context_menu
label="Clothes &gt;"
layout="topleft"
name="Clothes &gt;">
<menu_item_call
enabled="false"
label="Shirt"
layout="topleft"
name="Shirt">
<menu_item_call.on_click
function="Edit.TakeOff"
parameter="shirt" />
<menu_item_call.on_enable
function="Edit.EnableTakeOff"
parameter="shirt" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Pants"
layout="topleft"
name="Pants">
<menu_item_call.on_click
function="Edit.TakeOff"
parameter="pants" />
<menu_item_call.on_enable
function="Edit.EnableTakeOff"
parameter="pants" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Skirt"
layout="topleft"
name="Skirt">
<menu_item_call.on_click
function="Edit.TakeOff"
parameter="skirt" />
<menu_item_call.on_enable
function="Edit.EnableTakeOff"
parameter="skirt" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Shoes"
layout="topleft"
name="Shoes">
<menu_item_call.on_click
function="Edit.TakeOff"
parameter="shoes" />
<menu_item_call.on_enable
function="Edit.EnableTakeOff"
parameter="shoes" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Socks"
layout="topleft"
name="Socks">
<menu_item_call.on_click
function="Edit.TakeOff"
parameter="socks" />
<menu_item_call.on_enable
function="Edit.EnableTakeOff"
parameter="socks" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Jacket"
layout="topleft"
name="Jacket">
<menu_item_call.on_click
function="Edit.TakeOff"
parameter="jacket" />
<menu_item_call.on_enable
function="Edit.EnableTakeOff"
parameter="jacket" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Gloves"
layout="topleft"
name="Gloves">
<menu_item_call.on_click
function="Edit.TakeOff"
parameter="gloves" />
<menu_item_call.on_enable
function="Edit.EnableTakeOff"
parameter="gloves" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Undershirt"
layout="topleft"
name="Self Undershirt">
<menu_item_call.on_click
function="Edit.TakeOff"
parameter="undershirt" />
<menu_item_call.on_enable
function="Edit.EnableTakeOff"
parameter="undershirt" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Underpants"
layout="topleft"
name="Self Underpants">
<menu_item_call.on_click
function="Edit.TakeOff"
parameter="underpants" />
<menu_item_call.on_enable
function="Edit.EnableTakeOff"
parameter="underpants" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Tattoo"
layout="topleft"
name="Self Tattoo">
<menu_item_call.on_click
function="Edit.TakeOff"
parameter="tattoo" />
<menu_item_call.on_enable
function="Edit.EnableTakeOff"
parameter="tattoo" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Alpha"
layout="topleft"
name="Self Alpha">
<menu_item_call.on_click
function="Edit.TakeOff"
parameter="alpha" />
<menu_item_call.on_enable
function="Edit.EnableTakeOff"
parameter="alpha" />
</menu_item_call>
<menu_item_separator
layout="topleft" />
<menu_item_call
label="All Clothes"
layout="topleft"
name="All Clothes">
<menu_item_call.on_click
function="Edit.TakeOff"
parameter="all" />
</menu_item_call>
</context_menu>
<context_menu
label="HUD &gt;"
layout="topleft"
name="Object Detach HUD" />
<context_menu
label="Detach &gt;"
layout="topleft"
name="Object Detach" />
<menu_item_call
label="Detach All"
layout="topleft"
name="Detach All">
<menu_item_call.on_click
function="Self.RemoveAllAttachments"
parameter="" />
<menu_item_call.on_enable
function="Self.EnableRemoveAllAttachments" />
</menu_item_call>
</context_menu>
<menu_item_call
label="My Appearance"
layout="topleft"
name="Appearance...">
<menu_item_call.on_click
function="ShowFloater"
parameter="appearance" />
<menu_item_call.on_enable
function="Edit.EnableCustomizeAvatar" />
</menu_item_call>
<menu_item_call
label="My Friends"
layout="topleft"
name="Friends...">
<menu_item_call.on_click
function="SideTray.PanelPeopleTab"
parameter="friends_panel" />
</menu_item_call>
<!--menu_item_call
label="My Gestures"
layout="topleft"
name="Gestures...">
<menu_item_call.on_click
function="ShowFloater"
parameter="gestures" />
</menu_item_call-->
<menu_item_call
label="My Groups"
layout="topleft"
name="Groups...">
<menu_item_call.on_click
function="SideTray.PanelPeopleTab"
parameter="groups_panel" />
</menu_item_call>
<menu_item_call
label="My Profile"
layout="topleft"
name="Profile...">
<menu_item_call.on_click
function="ShowAgentProfile"
parameter="agent" />
</menu_item_call>
</context_menu>

65
indra/newview/skins/default/xui/en/menu_land.xml Normal file
View File

@ -0,0 +1,65 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu
layout="topleft"
name="Land Pie">
<menu_item_call
label="About Land"
name="About Land...">
<menu_item_call.on_click
function="ShowFloater"
parameter="about_land" />
</menu_item_call>
<!-- <menu_item_call
label="Go Here"
name="Go Here">
<menu_item_call.on_click
function="GoToObject" />
</menu_item_call>-->
<menu_item_call
label="Sit Here"
name="Sit Here">
<menu_item_call.on_click
function="Land.Sit" />
</menu_item_call>
<menu_item_separator
layout="topleft" />
<menu_item_call
enabled="false"
label="Buy This Land"
name="Land Buy">
<menu_item_call.on_click
function="ShowFloater"
parameter="buy land" />
<menu_item_call.on_enable
function="World.EnableBuyLand" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Buy Pass"
name="Land Buy Pass">
<menu_item_call.on_click
function="Land.BuyPass" />
<menu_item_call.on_enable
function="Land.EnableBuyPass" />
</menu_item_call>
<menu_item_separator
layout="topleft" />
<menu_item_call
enabled="false"
label="Build"
name="Create">
<menu_item_call.on_click
function="Land.Build" />
<menu_item_call.on_enable
function="EnableEdit" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Edit Terrain"
name="Edit Terrain">
<menu_item_call.on_click
function="Land.Edit" />
<menu_item_call.on_enable
function="EnableEdit" />
</menu_item_call>
</context_menu>

158
indra/newview/skins/default/xui/en/menu_object.xml Normal file
View File

@ -0,0 +1,158 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<context_menu
layout="topleft"
name="Object Pie">
<menu_item_call
enabled="false"
label="Touch"
name="Object Touch">
<menu_item_call.on_click
function="Object.Touch" />
<menu_item_call.on_enable
function="Object.EnableTouch"
name="EnableTouch"
parameter="Touch" />
</menu_item_call>
<menu_item_call
label="Edit"
name="Edit...">
<menu_item_call.on_click
function="Object.Edit" />
<menu_item_call.on_visible
function="EnableEdit"/>
</menu_item_call>
<menu_item_call
label="Build"
name="Build">
<menu_item_call.on_click
function="Object.Edit" />
<menu_item_call.on_visible
function="VisibleBuild"/>
</menu_item_call>
<menu_item_call
enabled="false"
label="Open"
name="Open">
<menu_item_call.on_click
function="Object.Open" />
<menu_item_call.on_enable
function="Object.EnableOpen" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Sit Here"
name="Object Sit">
<menu_item_call.on_click
function="Object.SitOrStand" />
<menu_item_call.on_enable
function="Object.EnableSitOrStand"
name="EnableSitOrStand"
parameter="Sit Here,Stand Up" />
</menu_item_call>
<menu_item_call
label="Object Profile"
name="Object Inspect">
<menu_item_call.on_click
function="Object.Inspect" />
<menu_item_call.on_enable
function="Object.EnableInspect" />
</menu_item_call>
<menu_item_separator layout="topleft" />
<context_menu
label="Put On &gt;"
name="Put On" >
<menu_item_call
enabled="false"
label="Wear"
name="Wear">
<menu_item_call.on_click
function="Object.AttachToAvatar" />
<menu_item_call.on_enable
function="Object.EnableWear" />
</menu_item_call>
<context_menu
label="Attach &gt;"
name="Object Attach" />
<context_menu
label="Attach HUD &gt;"
name="Object Attach HUD" />
</context_menu>
<context_menu
label="Remove &gt;"
name="Remove">
<menu_item_call
enabled="false"
label="Take"
name="Pie Object Take">
<menu_item_call.on_click
function="Tools.BuyOrTake" />
<menu_item_call.on_enable
function="Tools.EnableBuyOrTake"
parameter="Buy,Take" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Report Abuse"
name="Report Abuse...">
<menu_item_call.on_click
function="Object.ReportAbuse" />
<menu_item_call.on_enable
function="Object.EnableReportAbuse" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Block"
name="Object Mute">
<menu_item_call.on_click
function="Object.Mute" />
<menu_item_call.on_enable
function="Object.EnableMute" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Return"
name="Return...">
<menu_item_call.on_click
function="Object.Return" />
<menu_item_call.on_enable
function="Object.EnableReturn" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Delete"
name="Delete">
<menu_item_call.on_click
function="Object.Delete" />
<menu_item_call.on_enable
function="Object.EnableDelete" />
</menu_item_call>
</context_menu>
<menu_item_separator layout="topleft" />
<menu_item_call
enabled="false"
label="Take Copy"
name="Take Copy">
<menu_item_call.on_click
function="Tools.TakeCopy" />
<menu_item_call.on_enable
function="Tools.EnableTakeCopy" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Pay"
name="Pay...">
<menu_item_call.on_click
function="PayObject" />
<menu_item_call.on_enable
function="EnablePayObject" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Buy"
name="Buy...">
<menu_item_call.on_click
function="Object.Buy" />
<menu_item_call.on_enable
function="Object.EnableBuy" />
</menu_item_call>
</context_menu>