diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
| commit | 5ec8bbbe2244ea70d8aa74b5c572351632699425 (patch) | |
| tree | 12a4e92720c531105a21ef4f9f363b8572d72a3a /indra/newview/lltoolpie.cpp | |
| parent | b3b62c3b9ef32c4dbcae51cd3ef582734d5717bb (diff) | |
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index cdf2b25a39..55692d1962 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -310,12 +310,12 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show) LLString name = avatar->getFullname(); if (gMuteListp->isMuted(avatar->getID(), name)) { - gMenuHolder->childSetText("Avatar Mute", "Unmute"); + gMenuHolder->childSetText("Avatar Mute", LLString("Unmute")); // *TODO:Translate //gMutePieMenu->setLabel("Unmute"); } else { - gMenuHolder->childSetText("Avatar Mute", "Mute"); + gMenuHolder->childSetText("Avatar Mute", LLString("Mute")); // *TODO:Translate //gMutePieMenu->setLabel("Mute"); } @@ -336,12 +336,12 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show) } if (gMuteListp->isMuted(object->getID(), name)) { - gMenuHolder->childSetText("Object Mute", "Unmute"); + gMenuHolder->childSetText("Object Mute", LLString("Unmute")); // *TODO:Translate //gMuteObjectPieMenu->setLabel("Unmute"); } else { - gMenuHolder->childSetText("Object Mute", "Mute"); + gMenuHolder->childSetText("Object Mute", LLString("Mute")); // *TODO:Translate //gMuteObjectPieMenu->setLabel("Mute"); } @@ -675,3 +675,4 @@ void LLToolPie::render() return; } + |