summaryrefslogtreecommitdiff
path: root/indra/newview/llspeakbutton.cpp
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2009-12-18 15:23:33 -0500
committerNyx (Neal Orman) <nyx@lindenlab.com>2009-12-18 15:23:33 -0500
commit7836bba2dcaf47e2ccb43185507215c0cea9f76f (patch)
tree60f362913cb49d150637669d2b762156cdfe8a63 /indra/newview/llspeakbutton.cpp
parentfd71944170e69b0fc47b45c385c33ef7acf4cafb (diff)
parent8246111b12025bfb5864af354632737f67c32bd1 (diff)
merging latest PE changes into viewer-2-0
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()