diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-24 18:37:53 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-24 18:37:53 +0100 |
| commit | 6ba23344c95157793af9e4154933ae8df61630e8 (patch) | |
| tree | e12956cbe7a0082bbaaa545cb80d9e86b13f88e8 /indra/newview/lltoolpie.cpp | |
| parent | 01d06a3572c533f810f8f42e7ae9c55051f34aaf (diff) | |
| parent | 46e6135eef90b7ff0f08b12384a9aafc1a3e91e1 (diff) | |
merge heads. whew.
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 60df98ee99..d8be70e546 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -1554,7 +1554,7 @@ BOOL LLToolPie::pickRightMouseDownCallback() mute_msg = LLTrans::getString("MuteObject2"); } - gMenuHolder->childSetText("Object Mute", mute_msg); + gMenuHolder->getChild<LLUICtrl>("Object Mute")->setValue(mute_msg); gMenuObject->show(x, y); showVisualContextMenuEffect(); |