From 569b75bae934e89bfe872e6d8994a850c0051475 Mon Sep 17 00:00:00 2001
From: simon <none@none>
Date: Mon, 15 Apr 2013 11:56:15 -0700
Subject: MAINT-2595 - Viewer spams log at startup with caps issue.  Reviewed
 by Kelly

---
 indra/newview/llvoicevivox.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'indra/newview/llvoicevivox.cpp')

diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 9b5d981aa5..ac35bd4287 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -532,25 +532,25 @@ void LLVivoxVoiceClient::requestVoiceAccountProvision(S32 retries)
 {
 	LLViewerRegion *region = gAgent.getRegion();
 	
-	if ( region && (mVoiceEnabled || !mIsInitialized))
+	// If we've not received the capability yet, return.
+	// the password will remain empty, so we'll remain in
+	// stateIdle
+	if ( region && 
+		 region->capabilitiesReceived() &&
+		 (mVoiceEnabled || !mIsInitialized))
 	{
 		std::string url = 
 		region->getCapability("ProvisionVoiceAccountRequest");
 		
-		if ( url.empty() ) 
+		if ( !url.empty() ) 
 		{
-			// we've not received the capability yet, so return.
-			// the password will remain empty, so we'll remain in
-			// stateIdle
-			return;
-		}
+			LLHTTPClient::post(
+							   url,
+							   LLSD(),
+							   new LLVivoxVoiceAccountProvisionResponder(retries));
 		
-		LLHTTPClient::post(
-						   url,
-						   LLSD(),
-						   new LLVivoxVoiceAccountProvisionResponder(retries));
-		
-		setState(stateConnectorStart);		
+			setState(stateConnectorStart);		
+		}
 	}
 }
 
-- 
cgit v1.2.3


From c6991c9c75ff125654b68992c61a3c17c39bf5c5 Mon Sep 17 00:00:00 2001
From: simon <none@none>
Date: Mon, 15 Apr 2013 13:51:18 -0700
Subject: MAINT-2598 : Viewer logs warning about
 VoiceServiceConnectionStateChangedEvent

---
 indra/newview/llvoicevivox.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/llvoicevivox.cpp')

diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index ac35bd4287..abead02174 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -7660,6 +7660,9 @@ void LLVivoxProtocolParser::processResponse(std::string tag)
 			 */
 			// We don't need to process this, but we also shouldn't warn on it, since that confuses people.
 		}
+		else if (!stricmp(eventTypeCstr, "VoiceServiceConnectionStateChangedEvent"))  
+		{	// Yet another ignored event
+		}
 		else
 		{
 			LL_WARNS("VivoxProtocolParser") << "Unknown event type " << eventTypeString << LL_ENDL;
-- 
cgit v1.2.3