summaryrefslogtreecommitdiff
path: root/indra/newview/llspeakbutton.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2009-12-18 16:08:39 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2009-12-18 16:08:39 -0800
commitaa7efb7540d9eed9d8832bb65c52c3fdb1b811c8 (patch)
treed74df2438d1d62b6c2c683a12bcd42d8dee6e41b /indra/newview/llspeakbutton.cpp
parent043407238a4162c0d20413338cf6a7088be1f674 (diff)
parent4964ca39f14531630ffbfece593f8ba9cdc86e4e (diff)
merge.
Diffstat (limited to 'indra/newview/llspeakbutton.cpp')
-rw-r--r--indra/newview/llspeakbutton.cpp3
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()