diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 16:50:21 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 16:50:21 -0800 |
| commit | 5ed6e0720af1b6cdf1a983e2c040eeb5d8ae33ba (patch) | |
| tree | 5d0141f43cfaf59e5cb62eb2f4ca9541160e6173 /indra/newview/llspeakers.cpp | |
| parent | 3ab4b0f58326a01a09aa99f262c03d2703215af2 (diff) | |
| parent | 6e932911d5b0a02b44caf3bf81a9c00fd0e1dc89 (diff) | |
warn-on-failure:unix-eol
automated merge from trunk
Diffstat (limited to 'indra/newview/llspeakers.cpp')
| -rw-r--r-- | indra/newview/llspeakers.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp index a161588ddd..35d17687a8 100644 --- a/indra/newview/llspeakers.cpp +++ b/indra/newview/llspeakers.cpp @@ -70,8 +70,6 @@ LLSpeaker::LLSpeaker(const LLUUID& id, const std::string& name, const ESpeakerTy { mDisplayName = name; } - - LLVoiceClient::getInstance()->setUserVolume(id, LLMuteList::getInstance()->getSavedResidentVolume(id)); } |