diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-18 15:56:49 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-18 15:56:49 -0500 |
| commit | 1e922c266657d74e5a746334777917f4efaf7871 (patch) | |
| tree | 6ec595df9d8eb7e4d53947b7c930fc3afa60d73b /indra/newview/llspeakbutton.cpp | |
| parent | efdfc74b21f5d6386cc03136c4d2a8dcf07f9958 (diff) | |
| parent | cf5acb6af6eb2b9fe93789f84cb593b9fbe480aa (diff) | |
Automated merge with ssh://nyx@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llspeakbutton.cpp')
| -rw-r--r-- | indra/newview/llspeakbutton.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llspeakbutton.cpp b/indra/newview/llspeakbutton.cpp index 5edc4804ca..fd39bde118 100644 --- a/indra/newview/llspeakbutton.cpp +++ b/indra/newview/llspeakbutton.cpp @@ -119,6 +119,9 @@ LLSpeakButton::LLSpeakButton(const Params& p) // never show "muted" because you can't mute yourself mOutputMonitor->setIsMuted(false); mOutputMonitor->setIsAgentControl(true); + + //*TODO find a better place to do that + LLVoiceChannel::setCurrentVoiceChannelChangedCallback(boost::bind(&LLCallFloater::sOnCurrentChannelChanged, _1)); } LLSpeakButton::~LLSpeakButton() |