Merge remote-tracking branch 'mccabe/exp' into weekly

Conflicts:  (Keeping these around as a record, there was some strangeness.
	.gitignore
	linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
	linden/indra/newview/llfloaterregioninfo.cpp
	linden/indra/newview/llfloatertos.cpp
	linden/indra/newview/llpanellogin.cpp
	linden/indra/newview/skins/default/html/en-us/loading-error/index.html
	linden/indra/newview/skins/default/html/en-us/loading/loading.html
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
	linden/install.xml

1 files changed, 27 insertions, 18 deletions

diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 3800b4d..da7b840 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -62,6 +62,7 @@
 #include "llfirstuse.h"
 #include "llviewerwindow.h"
 #include "llviewercamera.h"
+#include "hippolimits.h"
 
 #include "llfloaterfriends.h"  //VIVOX, inorder to refresh communicate panel
 #include "llfloaterchat.h"              // for LLFloaterChat::addChat()
@@ -1524,15 +1525,22 @@ void LLVoiceClient::setState(state inState)
         
         mState = inState;
 }
+void LLVoiceClient::close()
+{
+        setState(stateDisableCleanup);
+}
+
+void LLVoiceClient::start()
+{
+        setState(stateStart);
+}
 
 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();
@@ -1549,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();
                         }
                         
@@ -1654,12 +1662,12 @@ void LLVoiceClient::stateMachine()
                                         //std::string exe_path = gDirUtilp->getAppRODataDir();
                                         std::string exe_path = gDirUtilp->getExecutableDir();
                                         exe_path += gDirUtilp->getDirDelimiter();
+#if LL_DARWIN
+                                        exe_path += "../Resources/";
+#endif
+                                        exe_path += gSavedSettings.getString("VoiceModule");
 #if LL_WINDOWS
-                                        exe_path += "SLVoice.exe";
-#elif LL_DARWIN
-                                        exe_path += "../Resources/SLVoice";
-#else
-                                        exe_path += "SLVoice";
+                                        exe_path += ".exe";
 #endif
                                         // See if the vivox executable exists
                                         llstat s;
@@ -1687,7 +1695,8 @@ void LLVoiceClient::stateMachine()
                                                 STARTUPINFOA sinfo;
                                                 memset(&sinfo, 0, sizeof(sinfo));
                                                 std::string exe_dir = gDirUtilp->getAppRODataDir();
-                                                cmd = "SLVoice.exe";
+                                                cmd = gSavedSettings.getString("VoiceModule");
+                                                cmd += ".exe";
                                                 cmd += args;
                                                 
                                                 // So retarded.  Windows requires that the second parameter to CreateProcessA be a writable (non-const) string...
@@ -1753,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;
                                         }       
                                 }
@@ -3772,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)
@@ -3950,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;
                                 
@@ -4468,7 +4477,7 @@ void LLVoiceClient::participantUpdatedEvent(
         }
         else
         {
-                LL_INFOS("Voice") << "unknown session " << sessionHandle << LL_ENDL;
+                LL_WARNS("Voice") << "unknown session " << sessionHandle << LL_ENDL;
         }
 }
 
@@ -5062,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;
         }
 }