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

STORM-1798 'Block' menuitem title isn't changed after blocking item in object inspector

meow-7.2.2
Jonathan Yap 2012-01-12 15:42:31 -05:00
parent 570d562f58
commit 2ae55b2be6
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
indra/newview/llviewermenu.cpp
View File

@ -2762,8 +2762,31 @@ bool enable_object_mute()
else
{
// Just a regular object
return LLSelectMgr::getInstance()->getSelection()->
contains( object, SELECT_ALL_TES );
return LLSelectMgr::getInstance()->getSelection()->contains( object, SELECT_ALL_TES ) &&
!LLMuteList::getInstance()->isMuted(object->getID());
}
}
bool enable_object_unmute()
{
LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
if (!object) return false;
LLVOAvatar* avatar = find_avatar_from_object(object);
if (avatar)
{
// It's an avatar
LLNameValue *lastname = avatar->getNVPair("LastName");
bool is_linden =
lastname && !LLStringUtil::compareStrings(lastname->getString(), "Linden");
bool is_self = avatar->isSelf();
return !is_linden && !is_self;
}
else
{
// Just a regular object
return LLSelectMgr::getInstance()->getSelection()->contains( object, SELECT_ALL_TES ) &&
LLMuteList::getInstance()->isMuted(object->getID());;
}
}
@ -8281,6 +8304,7 @@ void initialize_menus()
enable.add("Avatar.EnableMute", boost::bind(&enable_object_mute));
enable.add("Object.EnableMute", boost::bind(&enable_object_mute));
enable.add("Object.EnableUnmute", boost::bind(&enable_object_unmute));
enable.add("Object.EnableBuy", boost::bind(&enable_buy_object));
commit.add("Object.ZoomIn", boost::bind(&handle_look_at_selection, "zoom"));

9
indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml
View File

@ -113,6 +113,15 @@
<menu_item_call.on_visible
function="Object.EnableMute" />
</menu_item_call>
<menu_item_call
label="Unblock"
layout="topleft"
name="unblock">
<menu_item_call.on_click
function="Object.Mute" />
<menu_item_call.on_visible
function="Object.EnableUnmute" />
</menu_item_call>
<menu_item_call
label="Zoom In"
layout="topleft"