From 7060527bbc9a7a76cbc3b4b9bb772cb90542fd60 Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Fri, 15 Aug 2014 17:30:09 -0700 Subject: Added delay to Windows shutdown to let SLVoice die a good death. --- indra/newview/app_settings/settings.xml | 4 ++-- indra/newview/llappviewer.cpp | 2 +- indra/newview/llvoicevivox.cpp | 13 ++++++------- 3 files changed, 9 insertions(+), 10 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 757539ee74..fa348e0bcd 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13501,7 +13501,7 @@ VivoxDebugLevel Comment - Logging level to use when launching the vivox daemon SPATTERS FIX VALUE BEFORE CHECKIN + Logging level to use when launching the vivox daemon Persist 1 Type @@ -13518,7 +13518,7 @@ Type String Value - 500 + 5 VivoxDebugSIPURIHostName diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 29b883aef1..bf1a0a4173 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4897,7 +4897,7 @@ void LLAppViewer::idle() // hover callbacks // -#ifdef LL_DARWIN SPATTERS may want to make this mac-only. Test on Windows. +#ifdef LL_DARWIN if (mQuitRequested) //MAINT-4243 #endif { diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 48d458b142..2bee176b8d 100755 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -798,12 +798,9 @@ void LLVivoxVoiceClient::stateMachine() params.args.add("-ll"); params.args.add(loglevel); - //if (loglevel != "0") //SPATTERS - { - std::string log_folder = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, ""); - params.args.add("-lf"); - params.args.add(log_folder); - } + std::string log_folder = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, ""); + params.args.add("-lf"); + params.args.add(log_folder); if(!shutdown_timeout.empty()) { @@ -1542,7 +1539,6 @@ void LLVivoxVoiceClient::stateMachine() //MARK: stateLoggingOut case stateLoggingOut: // waiting for logout response // The handler for the AccountLoginStateChangeEvent will transition from here to stateLoggedOut. - LL_INFOS() << "SPATTERS do I need to stay alive here?" << LL_ENDL; break; //MARK: stateLoggedOut @@ -1646,6 +1642,9 @@ void LLVivoxVoiceClient::stateMachine() void LLVivoxVoiceClient::closeSocket(void) { +#ifdef LL_WINDOWS + _sleep(3000); //Wait a moment for socket to close. SPATTERS +#endif mSocket.reset(); mConnected = false; mConnectorHandle.clear(); -- cgit v1.2.3