diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-07-21 13:26:48 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-07-21 13:26:48 -0700 |
| commit | c25105945a9d74e331cae4d827fc3be8d8915b7a (patch) | |
| tree | 894c4f663fecc5659e2e1afbe7a815fd0b921f4f /indra/newview/lltoolpie.cpp | |
| parent | f5c7d69317af103b5f5f762d7e0adb82f12a71b3 (diff) | |
| parent | 532433674c9553636af9ea8d433b9da6d6fae587 (diff) | |
Merge with head of 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(); |