diff options
| -rw-r--r-- | autobuild.xml | 14 | ||||
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 24 |
2 files changed, 28 insertions, 10 deletions
diff --git a/autobuild.xml b/autobuild.xml index cea8b51ec5..ba97ad6010 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3032,9 +3032,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>b1b0134bc55f55a7c1a04ee78d70c64d</string> + <string>9967239f089286df6602ecdc286d0e5e</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12438/73598/slvoice-4.9.0002.27586.511884-darwin64-511884.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14696/94164/slvoice-4.9.0002.29501.513182-darwin64-513182.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -3068,9 +3068,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>ec50c31efce74bdedee470b5388aeeec</string> + <string>2bc9ec543ec9caaf1bf9b3975e6309ae</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12434/73576/slvoice-4.9.0002.27586.511884-windows-511884.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14697/94170/slvoice-4.9.0002.29501.513182-windows-513182.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -3080,16 +3080,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>4bf45d641bf5b2bd6b2cc39edcb01a6e</string> + <string>c591df530ba802e1cf50119f4248a952</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12433/73570/slvoice-4.9.0002.27586.511884-windows64-511884.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14698/94176/slvoice-4.9.0002.29501.513182-windows64-513182.tar.bz2</string> </map> <key>name</key> <string>windows64</string> </map> </map> <key>version</key> - <string>4.9.0002.27586.511884</string> + <string>4.9.0002.29501.513182</string> </map> <key>tut</key> <map> diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 6e5a5e3084..8e46e08b14 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -731,6 +731,7 @@ bool LLVivoxVoiceClient::startAndLaunchDaemon() if (!voiceEnabled()) { // Voice is locked out, we must not launch the vivox daemon. + LL_WARNS("Voice") << "voice disabled; not starting daemon" << LL_ENDL; return false; } @@ -887,9 +888,11 @@ bool LLVivoxVoiceClient::startAndLaunchDaemon() bool LLVivoxVoiceClient::provisionVoiceAccount() { LL_INFOS("Voice") << "Provisioning voice account." << LL_ENDL; + LL_DEBUGS("Voice") << "no region for voice provisioning; waiting " << LL_ENDL; while (!gAgent.getRegion() || !gAgent.getRegion()->capabilitiesReceived()) { + LL_DEBUGS("Voice") << "no capabilities for voice provisioning; waiting " << LL_ENDL; // *TODO* Pump a message for wake up. llcoro::suspend(); } @@ -1274,17 +1277,30 @@ bool LLVivoxVoiceClient::requestParcelVoiceInfo() LLSD voice_credentials = result["voice_credentials"]; if (voice_credentials.has("channel_uri")) { + LL_DEBUGS("Voice") << "got voice channel uri" << LL_ENDL; uri = voice_credentials["channel_uri"].asString(); } + else + { + LL_WARNS("Voice") << "No voice channel uri" << LL_ENDL; + } + if (voice_credentials.has("channel_credentials")) { + LL_DEBUGS("Voice") << "got voice channel credentials" << LL_ENDL; credentials = voice_credentials["channel_credentials"].asString(); } - } + else + { + LL_WARNS("Voice") << "No voice channel credentials" << LL_ENDL; - if (!uri.empty()) - LL_INFOS("Voice") << "Voice URI is " << uri << LL_ENDL; + } + } + else + { + LL_WARNS("Voice") << "No voice credentials" << LL_ENDL; + } // set the spatial channel. If no voice credentials or uri are // available, then we simply drop out of voice spatially. @@ -1628,8 +1644,10 @@ bool LLVivoxVoiceClient::waitForChannel() if (mRelogRequested) { + LL_DEBUGS("Voice") << "Relog Requested, restarting provisioning" << LL_ENDL; if (!provisionVoiceAccount()) { + LL_WARNS("Voice") << "provisioning voice failed; giving up" << LL_ENDL; giveUp(); return false; } |