diff options
| author | Ramzi Linden <ramzi@lindenlab.com> | 2010-01-19 16:01:49 -0800 |
|---|---|---|
| committer | Ramzi Linden <ramzi@lindenlab.com> | 2010-01-19 16:01:49 -0800 |
| commit | cdae00e7f0afd463ad84bea07bdb1e6bd2d27814 (patch) | |
| tree | 8459bfab22363ead00547fcde5b3ccbe50b53780 /indra/newview | |
| parent | b8122d10d154cecb35a91ca385fc3f118efebcf4 (diff) | |
better fix of EXT-299 "Mute" still showing in avatar Context menu, although label says "Block"
The original fix at r6543 created a duplicate node, which breaks localization. Renaming that new node with a unique name=.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index da7e8cd767..da68af1597 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -1515,7 +1515,7 @@ BOOL LLToolPie::pickRightMouseDownCallback() } else { - mute_msg = LLTrans::getString("MuteObject"); + mute_msg = LLTrans::getString("MuteObject2"); } gMenuHolder->childSetText("Object Mute", mute_msg); diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 02dc507781..b378944e48 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2170,7 +2170,7 @@ this texture in your inventory Unknown file extension .%s Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh </string> - <string name="MuteObject">Block</string> + <string name="MuteObject2">Block</string> <string name="MuteAvatar">Block</string> <string name="UnmuteObject">Unblock</string> <string name="UnmuteAvatar">Unblock</string> |