diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 14:12:18 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 14:12:18 -0800 |
| commit | 0ac14158bcec40e65fb26d2fea7555ede1e2ca94 (patch) | |
| tree | bacf3b28ac4de7f69da67d7616923dafe92b0d49 /indra/newview/llappviewer.cpp | |
| parent | 92cef0426df15c0e661fa795e6b00214f381dd05 (diff) | |
| parent | ab0c9c6754836cb26a520d0a9b2d7bbdd13a5f32 (diff) | |
automated merge from trunk
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 6d0bbee755..d38278864b 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -907,7 +907,6 @@ bool LLAppViewer::mainLoop() { LLMemType mt1(LLMemType::MTYPE_MAIN); mMainloopTimeout = new LLWatchdogTimeout(); - // *FIX:Mani - Make this a setting, once new settings exist in this branch. //------------------------------------------- // Run main loop until time to quit @@ -917,11 +916,11 @@ bool LLAppViewer::mainLoop() gServicePump = new LLPumpIO(gAPRPoolp); LLHTTPClient::setPump(*gServicePump); LLCurl::setCAFile(gDirUtilp->getCAFile()); - + // Note: this is where gLocalSpeakerMgr and gActiveSpeakerMgr used to be instantiated. + LLVoiceChannel::initClass(); LLVoiceClient::getInstance()->init(gServicePump); - LLTimer frameTimer,idleTimer; LLTimer debugTime; LLViewerJoystick* joystick(LLViewerJoystick::getInstance()); |