summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatervoicevolume.cpp
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-12-10 10:32:33 -0800
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-12-10 10:32:33 -0800
commit3c591c1a929ddc8447620e5062401b6586ebc718 (patch)
tree90ada0c932fce7c715ffab7be906c57a40948ebe /indra/newview/llfloatervoicevolume.cpp
parent9da625d439a9a911733564177e32facc3669dc58 (diff)
parent08a7f4193b18ca5c0bbaf144232eeb2678205eae (diff)
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
Diffstat (limited to 'indra/newview/llfloatervoicevolume.cpp')
-rw-r--r--indra/newview/llfloatervoicevolume.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatervoicevolume.cpp b/indra/newview/llfloatervoicevolume.cpp
index 87b388b30a..a1df73a065 100644
--- a/indra/newview/llfloatervoicevolume.cpp
+++ b/indra/newview/llfloatervoicevolume.cpp
@@ -151,7 +151,7 @@ void LLFloaterVoiceVolume::updateVolumeControls()
// By convention, we only display and toggle voice mutes, not all mutes
bool is_muted = LLAvatarActions::isVoiceMuted(mAvatarID);
- bool is_linden = LLStringUtil::endsWith(mAvatarName.getLegacyName(), " Linden");
+ bool is_linden = LLStringUtil::endsWith(mAvatarName.getUserName(), " Linden");
mute_btn->setEnabled(!is_linden);
mute_btn->setValue(is_muted);