diff options
| author | Aura Linden <aura@lindenlab.com> | 2014-08-15 18:51:20 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2014-08-15 18:51:20 -0700 |
| commit | b12e241751bef94cecb99e5577f1a75f0cbe2147 (patch) | |
| tree | 604b57deabdcb2b0393dc08ffe2ac92192ecb6da | |
| parent | 370aa671c66cfd5e2a338602d2e9765e9ea103f8 (diff) | |
| parent | 7060527bbc9a7a76cbc3b4b9bb772cb90542fd60 (diff) | |
Merged with windows fixes.
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 4 | ||||
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llvoicevivox.cpp | 13 |
3 files changed, 9 insertions, 10 deletions
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 @@ <key>VivoxDebugLevel</key> <map> <key>Comment</key> - <string>Logging level to use when launching the vivox daemon SPATTERS FIX VALUE BEFORE CHECKIN</string> + <string>Logging level to use when launching the vivox daemon</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -13518,7 +13518,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>500</string> + <string>5</string> </map> <key>VivoxDebugSIPURIHostName</key> <map> diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 9cc21ad22e..56f306138b 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 1eb0ac6ae0..4f89972192 100755 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -799,12 +799,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()) { @@ -1543,7 +1540,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 @@ -1647,6 +1643,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(); |