livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged with windows fixes.

meow-7.2.2
Aura Linden 2014-08-15 18:51:20 -07:00
parent 370aa671c6 7060527bbc
commit b12e241751
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/app_settings/settings.xml
View File

@ -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>

2
indra/newview/llappviewer.cpp
View File

@ -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
{

13
indra/newview/llvoicevivox.cpp
View File

@ -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();