diff options
| author | simon <none@none> | 2013-04-15 11:56:15 -0700 | 
|---|---|---|
| committer | simon <none@none> | 2013-04-15 11:56:15 -0700 | 
| commit | 569b75bae934e89bfe872e6d8994a850c0051475 (patch) | |
| tree | ab0e35e3db11c29695f8c21851cdcb96699db39d /indra | |
| parent | cd8cd8c265abb0c568ee7b925551023c8081c298 (diff) | |
MAINT-2595 - Viewer spams log at startup with caps issue.  Reviewed by Kelly
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 26 | 
1 files changed, 13 insertions, 13 deletions
| 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);		 +		}  	}  } | 
