1 files changed, 10 insertions, 12 deletions

diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 5517ca2..c05f685 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -1537,12 +1537,10 @@ void LLVoiceClient::start()
 
 void LLVoiceClient::stateMachine()
 {
-        if(gDisconnected)
-        {
-                // The viewer has been disconnected from the sim.  Disable voice.
-                setVoiceEnabled(false);
-        }
-        
+
+        // Disable voice as long as the viewer is disconnected from the sim (login/relog)
+        setVoiceEnabled(!gDisconnected);
+
         if(mVoiceEnabled)
         {
                 updatePosition();
@@ -1559,7 +1557,7 @@ void LLVoiceClient::stateMachine()
                         if(!mConnected)
                         {
                                 // if voice was turned off after the daemon was launched but before we could connect to it, we may need to issue a kill.
-                                LL_INFOS("Voice") << "Disabling voice before connection to daemon, terminating." << LL_ENDL;
+                                LL_WARNS("Voice") << "Disabling voice before connection to daemon, terminating." << LL_ENDL;
                                 killGateway();
                         }
                         
@@ -1764,7 +1762,7 @@ void LLVoiceClient::stateMachine()
                                         }       
                                         else
                                         {
-                                                LL_INFOS("Voice") << exe_path << " not found." << LL_ENDL;
+                                                LL_WARNS("Voice") << exe_path << " not found." << LL_ENDL;
                                                 mVoiceEnabled = false;
                                         }       
                                 }
@@ -3783,7 +3781,7 @@ void LLVoiceClient::loginResponse(int statusCode, std::string &statusString, std
         if ( statusCode == 401 )
         {
                 // Login failure which is probably caused by the delay after a user's password being updated.
-                LL_INFOS("Voice") << "Account.Login response failure (" << statusCode << "): " << statusString << LL_ENDL;
+                LL_WARNS("Voice") << "Account.Login response failure (" << statusCode << "): " << statusString << LL_ENDL;
                 setState(stateLoginRetry);
         }
         else if(statusCode != 0)
@@ -3961,7 +3959,7 @@ void LLVoiceClient::sessionAddedEvent(
                         }
                         else
                         {
-                                LL_INFOS("Voice") << "Could not generate caller id from uri, using hash of uri " << session->mSIPURI << LL_ENDL;
+                                LL_WARNS("Voice") << "Could not generate caller id from uri, using hash of uri " << session->mSIPURI << LL_ENDL;
                                 setUUIDFromStringHash(session->mCallerID, session->mSIPURI);
                                 session->mSynthesizedCallerID = true;
                                 
@@ -4479,7 +4477,7 @@ void LLVoiceClient::participantUpdatedEvent(
         }
         else
         {
-                LL_INFOS("Voice") << "unknown session " << sessionHandle << LL_ENDL;
+                LL_WARNS("Voice") << "unknown session " << sessionHandle << LL_ENDL;
         }
 }
 
@@ -5073,7 +5071,7 @@ void LLVoiceClient::parcelChanged()
         else
         {
                 // The transition to stateNoChannel needs to kick this off again.
-                LL_INFOS("Voice") << "not logged in yet, deferring" << LL_ENDL;
+                LL_WARNS("Voice") << "not logged in yet, deferring" << LL_ENDL;
         }
 }