From 75406641836fee796428216df82b7e29ad24443a Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Wed, 13 Aug 2014 18:12:25 -0700 Subject: Ported from defective branch. --- indra/newview/app_settings/settings.xml | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 000362ebfd..757539ee74 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6118,16 +6118,16 @@ 0 MemoryLogFrequency - - Comment - Seconds between display of Memory in log (0 for never) - Persist - 1 - Type - F32 - Value - 30.0 - + + Comment + Seconds between display of Memory in log (0 for never) + Persist + 1 + Type + F32 + Value + 600.0 + MemoryPrivatePoolEnabled Comment @@ -13501,7 +13501,7 @@ VivoxDebugLevel Comment - Logging level to use when launching the vivox daemon + Logging level to use when launching the vivox daemon SPATTERS FIX VALUE BEFORE CHECKIN Persist 1 Type @@ -13509,6 +13509,17 @@ Value 0 + VivoxShutdownTimeout + + Comment + shutdown timeout in miliseconds. The amount of time to wait for the service to shutdown gracefully after the last disconnect + Persist + 1 + Type + String + Value + 500 + VivoxDebugSIPURIHostName Comment -- cgit v1.3 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/app_settings') 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.3 From d47efdfe03095d2b33fe8a1e6c3adccd25dfdc8b Mon Sep 17 00:00:00 2001 From: ruslantproductengine Date: Wed, 10 Sep 2014 21:08:08 +0300 Subject: MAINT-3964 FIXED Textures with Alpha won't Animate on Rigged Mesh when worn : fix in shader (mul texcoord to tex matrix), array's optimization --- indra/llrender/llrender.cpp | 2 +- indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl | 5 ++--- indra/newview/lldrawpoolavatar.cpp | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index 388d3a4f1a..0af402efea 100755 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -1168,7 +1168,7 @@ void LLRender::syncMatrices() { stop_glerror(); - U32 name[] = + static const U32 name[] = { LLShaderMgr::MODELVIEW_MATRIX, LLShaderMgr::PROJECTION_MATRIX, diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl index b40785bbd7..506118d381 100755 --- a/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl @@ -111,10 +111,9 @@ void main() #ifdef USE_INDEXED_TEX passTextureIndex(); - vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy; -#else - vary_texcoord0 = texcoord0; #endif + + vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy; vary_norm = norm; vary_position = pos.xyz; diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index 90e6dfe351..afd5b84537 100755 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -375,7 +375,7 @@ void LLDrawPoolAvatar::endPostDeferredAlpha() void LLDrawPoolAvatar::renderPostDeferred(S32 pass) { - const S32 actual_pass[] = + static const S32 actual_pass[] = { //map post deferred pass numbers to what render() expects 2, //skinned 4, // rigged fullbright -- cgit v1.3 From 983ab95365cf45138aa05ab694c492fc141be2a8 Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Thu, 4 Sep 2014 11:28:42 -0700 Subject: Added code to allow alternate directory destination for vivox log. --- indra/newview/app_settings/settings.xml | 11 +++++++++++ indra/newview/llvoicevivox.cpp | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index fa348e0bcd..eb5b1786d8 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13509,6 +13509,17 @@ Value 0 + VivoxLogDirectory + + Comment + Default log path is Application Support/SecondLife/logs specify alternate absolute path here. + Persist + 1 + Type + String + Value + + VivoxShutdownTimeout Comment diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 0387b18673..f980f886cf 100755 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -810,7 +810,13 @@ void LLVivoxVoiceClient::stateMachine() params.args.add("-ll"); params.args.add(loglevel); - std::string log_folder = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, ""); + std::string log_folder = gSavedSettings.getString("VivoxLogDirectory"); + + if (log_folder.empty()) + { + log_folder = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, ""); + } + params.args.add("-lf"); params.args.add(log_folder); -- cgit v1.3