summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2016-04-19 14:17:28 -0700
committerRider Linden <rider@lindenlab.com>2016-04-19 14:17:28 -0700
commit16e06b4b50af3f4f4e3c91f8db1e4f59a44d8422 (patch)
treef12a64c026d57b5d45b6c280033ad1eb838b521d /indra
parent86a3e1a3dc59c964d78c509e99a59d52eea32b34 (diff)
MAINT-6336: more loging for test build.
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llvoicevivox.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 518b5bdc65..17e538fcfa 100755
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -1161,6 +1161,8 @@ bool LLVivoxVoiceClient::addAndJoinSession(const sessionStatePtr_t &nextSession)
// The old session may now need to be deleted.
reapSession(oldSession);
+ LL_INFOS("Voice") << "Done reap test." << LL_ENDL;
+
if (!mAudioSession->mHandle.empty())
{
// Connect to a session by session handle
@@ -1175,6 +1177,7 @@ bool LLVivoxVoiceClient::addAndJoinSession(const sessionStatePtr_t &nextSession)
notifyStatusObservers(LLVoiceClientStatusObserver::STATUS_JOINING);
+ LL_INFOS("Voice") << "suspend after notify STATUS_JOINING." << LL_ENDL;
llcoro::suspend();
LLSD result;
@@ -1195,6 +1198,7 @@ bool LLVivoxVoiceClient::addAndJoinSession(const sessionStatePtr_t &nextSession)
if (!mVoiceEnabled && mIsInitialized)
{
+ LL_INFOS("Voice") << "Voice no longer enabled. Exiting." << LL_ENDL;
mIsJoiningSession = false;
// User bailed out during connect -- jump straight to teardown.
terminateAudioSession(true);
@@ -1203,6 +1207,7 @@ bool LLVivoxVoiceClient::addAndJoinSession(const sessionStatePtr_t &nextSession)
}
else if (mSessionTerminateRequested)
{
+ LL_INFOS("Voice") << "Terminate requested" << LL_ENDL;
if (mAudioSession && !mAudioSession->mHandle.empty())
{
// Only allow direct exits from this state in p2p calls (for cancelling an invite).
@@ -1229,12 +1234,13 @@ bool LLVivoxVoiceClient::addAndJoinSession(const sessionStatePtr_t &nextSession)
// This is a cheap way to make sure both have happened before proceeding.
do
{
+ LL_INFOS("Voice") << "Top of add join loop." << LL_ENDL;
LLEventTimeout voicePumpTimeout(voicePump);
voicePumpTimeout.eventAfter(SESSION_JOIN_TIMEOUT, timeoutResult);
result = llcoro::suspendUntilEventOn(voicePumpTimeout);
- LL_DEBUGS("Voice") << "event=" << ll_pretty_print_sd(result) << LL_ENDL;
+ LL_INFOS("Voice") << "event=" << ll_pretty_print_sd(result) << LL_ENDL;
if (result.has("session"))
{
if (result.has("handle"))
@@ -1275,6 +1281,9 @@ bool LLVivoxVoiceClient::addAndJoinSession(const sessionStatePtr_t &nextSession)
}
} while (!added || !joined);
+
+ LL_INFOS("Voice") << "Left voice loop." << LL_ENDL;
+
mIsJoiningSession = false;
if (mSpatialJoiningNum > 100)