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

MAINT-1744 FIXED User cannot unblock an object by selecting "Unblock" menu item from object's pop-up menu

meow-7.2.2
Mnikolenko ProductEngine 2014-03-18 11:48:14 +02:00
parent abf5d5b360
commit c73d307304
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/lltoolpie.cpp
View File

@ -1671,17 +1671,7 @@ BOOL LLToolPie::handleRightClickPick()
{
name = node->mName;
}
std::string mute_msg;
if (LLMuteList::getInstance()->isMuted(object->getID(), name))
{
mute_msg = LLTrans::getString("UnmuteObject");
}
else
{
mute_msg = LLTrans::getString("MuteObject2");
}
gMenuHolder->getChild<LLUICtrl>("Object Mute")->setValue(mute_msg);
gMenuObject->show(x, y);
showVisualContextMenuEffect();

19
indra/newview/skins/default/xui/en/menu_object.xml
View File

@ -130,15 +130,22 @@
function="Object.ReportAbuse" />
<menu_item_call.on_enable
function="Object.EnableReportAbuse" />
</menu_item_call>
<menu_item_call
label="Block"
name="Object Mute">
<menu_item_call.on_click
function="Object.Mute" />
<menu_item_call.on_visible
function="Object.EnableMute" />
</menu_item_call>
<menu_item_call
enabled="false"
label="Block"
name="Object Mute">
<menu_item_call.on_click
label="Unblock"
name="Object Unmute">
<menu_item_call.on_click
function="Object.Mute" />
<menu_item_call.on_enable
function="Object.EnableMute" />
<menu_item_call.on_visible
function="Object.EnableUnmute" />
</menu_item_call>
<menu_item_call
enabled="false"