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.2.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 ++-- 1 file changed, 2 insertions(+), 2 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 -- cgit v1.2.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/newview/app_settings/shaders/class1/deferred/alphaV.glsl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'indra/newview/app_settings') 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; -- cgit v1.2.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 +++++++++++ 1 file changed, 11 insertions(+) (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 -- cgit v1.2.3 From 553b7ede723ceed310f1dbbfba25f5bf555466e1 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Mon, 22 Dec 2014 11:14:15 -0500 Subject: Moved AvatarPosFinalOffset to per-account settings file --- indra/newview/app_settings/settings.xml | 15 --------------- indra/newview/app_settings/settings_per_account.xml | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 138bdde9e9..94d3c8a59f 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -654,21 +654,6 @@ Value 2 - AvatarPosFinalOffset - - Comment - After-everything-else fixup for avatar position. - Persist - 1 - Type - Vector3 - Value - - 0.0 - 0.0 - 0.0 - - AvatarPickerURL Comment diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index fc6f1f6395..7975fe9e3a 100755 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -1,5 +1,20 @@ + AvatarPosFinalOffset + + Comment + After-everything-else fixup for avatar position. + Persist + 1 + Type + Vector3 + Value + + 0.0 + 0.0 + 0.0 + + DoNotDisturbResponseChanged Comment -- cgit v1.2.3