1 files changed, 6 insertions, 46 deletions

diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index f0dafef..738eeac 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -678,31 +678,6 @@ void LLVivoxProtocolParser::processResponse(std::string tag)
 
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
-class LLVoiceClientPrefsListener: public LLSimpleListener
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                // Note: Ignore the specific event value, look up the ones we want
-
-                gVoiceClient->setVoiceEnabled(gSavedSettings.getBOOL("EnableVoiceChat"));
-                gVoiceClient->setUsePTT(gSavedSettings.getBOOL("PTTCurrentlyEnabled"));
-                std::string keyString = gSavedSettings.getString("PushToTalkButton");
-                gVoiceClient->setPTTKey(keyString);
-                gVoiceClient->setPTTIsToggle(gSavedSettings.getBOOL("PushToTalkToggle"));
-                gVoiceClient->setEarLocation(gSavedSettings.getS32("VoiceEarLocation"));
-                std::string serverName = gSavedSettings.getString("VivoxDebugServerName");
-                gVoiceClient->setVivoxDebugServerName(serverName);
-
-                std::string inputDevice = gSavedSettings.getString("VoiceInputAudioDevice");
-                gVoiceClient->setCaptureDevice(inputDevice);
-                std::string outputDevice = gSavedSettings.getString("VoiceOutputAudioDevice");
-                gVoiceClient->setRenderDevice(outputDevice);
-
-                return true;
-        }
-};
-static LLVoiceClientPrefsListener voice_prefs_listener;
-
 class LLVoiceClientMuteListObserver : public LLMuteListObserver
 {
         /* virtual */ void onChange()  { gVoiceClient->muteListChanged();}
@@ -859,16 +834,6 @@ LLVoiceClient::LLVoiceClient()
         std::string renderDevice = gSavedSettings.getString("VoiceOutputAudioDevice");
         setRenderDevice(renderDevice);
         
-        // Set up our listener to get updates on all prefs values we care about.
-        gSavedSettings.getControl("EnableVoiceChat")->addListener(&voice_prefs_listener);
-        gSavedSettings.getControl("PTTCurrentlyEnabled")->addListener(&voice_prefs_listener);
-        gSavedSettings.getControl("PushToTalkButton")->addListener(&voice_prefs_listener);
-        gSavedSettings.getControl("PushToTalkToggle")->addListener(&voice_prefs_listener);
-        gSavedSettings.getControl("VoiceEarLocation")->addListener(&voice_prefs_listener);
-        gSavedSettings.getControl("VivoxDebugServerName")->addListener(&voice_prefs_listener);
-        gSavedSettings.getControl("VoiceInputAudioDevice")->addListener(&voice_prefs_listener);
-        gSavedSettings.getControl("VoiceOutputAudioDevice")->addListener(&voice_prefs_listener);
-
         mTuningMode = false;
         mTuningEnergy = 0.0f;
         mTuningMicVolume = 0;
@@ -1239,12 +1204,7 @@ void LLVoiceClient::stateMachine()
         // Check for parcel boundary crossing
         {
                 LLViewerRegion *region = gAgent.getRegion();
-                LLParcel *parcel = NULL;
-
-                if(gParcelMgr)
-                {
-                        parcel = gParcelMgr->getAgentParcel();
-                }                       
+                LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
                 
                 if(region && parcel)
                 {
@@ -1281,7 +1241,7 @@ void LLVoiceClient::stateMachine()
                 break;
                 
                 case stateStart:
-                        if(gDisableVoice)
+                        if(gSavedSettings.getBOOL("CmdLineDisableVoice"))
                         {
                                 // Voice is locked out, we must not launch the vivox daemon.
                                 setState(stateJail);
@@ -1661,9 +1621,9 @@ void LLVoiceClient::stateMachine()
                         notifyStatusObservers(LLVoiceClientStatusObserver::STATUS_LOGGED_IN);
 
                         // Set up the mute list observer if it hasn't been set up already.
-                        if((!sMuteListListener_listening) && (gMuteListp))
+                        if((!sMuteListListener_listening))
                         {
-                                gMuteListp->addObserver(&mutelist_listener);
+                                LLMuteList::getInstance()->addObserver(&mutelist_listener);
                                 sMuteListListener_listening = true;
                         }
 
@@ -3103,7 +3063,7 @@ void LLVoiceClient::updateMuteState(participantState *p)
 {
         if(p->mAvatarIDValid)
         {
-                bool isMuted = gMuteListp->isMuted(p->mAvatarID, LLMute::flagVoiceChat);
+                bool isMuted = LLMuteList::getInstance()->isMuted(p->mAvatarID, LLMute::flagVoiceChat);
                 if(p->mOnMuteList != isMuted)
                 {
                         p->mOnMuteList = isMuted;
@@ -3644,7 +3604,7 @@ void LLVoiceClient::setVoiceEnabled(bool enabled)
 
 bool LLVoiceClient::voiceEnabled()
 {
-        return gSavedSettings.getBOOL("EnableVoiceChat") && !gDisableVoice;
+        return gSavedSettings.getBOOL("EnableVoiceChat") && !gSavedSettings.getBOOL("CmdLineDisableVoice");
 }
 
 void LLVoiceClient::setUsePTT(bool usePTT)