diff options
author | Graham Linden <none@none> | 2014-07-31 08:40:57 -0700 |
---|---|---|
committer | Graham Linden <none@none> | 2014-07-31 08:40:57 -0700 |
commit | db43a0560c259623a1a8022668f8482d82cae9c8 (patch) | |
tree | 31e532720212ed1697897d6c2694fe991cb8f812 /indra/newview/lltoolpie.cpp | |
parent | 76e7f978c157f9921593ea0e43f642cb9de4703d (diff) | |
parent | 532433674c9553636af9ea8d433b9da6d6fae587 (diff) |
Merge viewer-release
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
-rwxr-xr-x | indra/newview/lltoolpie.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 558159775f..6881ec4563 100755 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -1672,17 +1672,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(); |