diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-10-03 16:57:48 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-10-03 16:57:48 -0700 |
| commit | ba5760a4d9d110890aab26a394479b36e60915d7 (patch) | |
| tree | acad21a7c576de056bfa21a37027a673feab8fad /indra/newview/llappviewer.cpp | |
| parent | bd64c483639ae33518609398fce7c51ddc73dae7 (diff) | |
| parent | f2510ca0d629a2cd6cd85588698672f5a0c4e64a (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 08a1a237f5..6b15e4b21a 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -42,6 +42,7 @@ #include "llagentcamera.h" #include "llagentlanguage.h" #include "llagentwearables.h" +#include "llimfloatercontainer.h" #include "llwindow.h" #include "llviewerstats.h" #include "llviewerstatsrecorder.h" @@ -1204,7 +1205,7 @@ bool LLAppViewer::mainLoop() LLVoiceChannel::initClass(); LLVoiceClient::getInstance()->init(gServicePump); - LLVoiceChannel::setCurrentVoiceChannelChangedCallback(boost::bind(&LLCallFloater::sOnCurrentChannelChanged, _1), true); + LLVoiceChannel::setCurrentVoiceChannelChangedCallback(boost::bind(&LLIMFloaterContainer::onCurrentChannelChanged, _1), true); LLTimer frameTimer,idleTimer; LLTimer debugTime; LLViewerJoystick* joystick(LLViewerJoystick::getInstance()); |