diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index f7d1204329..942abab731 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -16907,7 +16907,7 @@ Change of this parameter will affect the layout of buttons in notification toast 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 @@ -16926,7 +16926,7 @@ Change of this parameter will affect the layout of buttons in notification toast Type String Value - 500 + 5 VivoxDebugSIPURIHostName diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 294fe11c5a..607cc74dad 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -5687,7 +5687,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 d153663ca2..3345cbab9b 100755 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -805,12 +805,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()) { @@ -1567,7 +1564,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 @@ -1671,6 +1667,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();