diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-27 14:52:17 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-27 14:52:17 -0400 |
| commit | 1e70d53b198e15a85138a8f0ebdf6f77f070f916 (patch) | |
| tree | 49d58bf6cd6584834b6e91688ad8bfb34bd38cff /indra/newview/llappviewer.cpp | |
| parent | 0c84957d312bc3dc31fdb5711317157df73b72e6 (diff) | |
| parent | 1b173ed82b65c7bb5f5d5294847a721b64f8cf35 (diff) | |
merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index e38f86d0fc..ecfd101eeb 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -89,6 +89,7 @@ #include "llweb.h" #include "llsecondlifeurls.h" #include "llupdaterservice.h" +#include "llcallfloater.h" // Linden library includes #include "llavatarnamecache.h" @@ -112,6 +113,7 @@ #include <boost/foreach.hpp> + #if LL_WINDOWS # include <share.h> // For _SH_DENYWR in initMarkerFile #else @@ -1183,6 +1185,7 @@ bool LLAppViewer::mainLoop() LLVoiceChannel::initClass(); LLVoiceClient::getInstance()->init(gServicePump); + LLVoiceChannel::setCurrentVoiceChannelChangedCallback(boost::bind(&LLCallFloater::sOnCurrentChannelChanged, _1), true); LLTimer frameTimer,idleTimer; LLTimer debugTime; LLViewerJoystick* joystick(LLViewerJoystick::getInstance()); |