From 6c667b8c3372505b17385efaac7c0e758b29a1a7 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 28 Jan 2013 16:20:52 -0500 Subject: rename "Lighting and Shadows" (deferred rendering) to "Advanced Lighting Model" --- indra/newview/app_settings/settings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 7deb1284b9..258370d6f3 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8143,7 +8143,7 @@ RenderSpotLightsInNondeferred Comment - Whether to support projectors as spotlights when Lighting and Shadows is disabled + Whether to support projectors as spotlights when Advanced Lighting Model is disabled Persist 1 Type @@ -8314,7 +8314,7 @@ RenderDeferred Comment - Use deferred rendering pipeline. + Use deferred rendering pipeline (Advanced Lighting Model). Persist 1 Type @@ -8502,7 +8502,7 @@ RenderAutoMaskAlphaNonDeferred Comment - Use alpha masks where appropriate, in the non-deferred (non-'Lighting and Shadows') graphics mode + Use alpha masks where appropriate when not using the Advanced Lighting Model Persist 1 Type @@ -8513,7 +8513,7 @@ RenderAutoMaskAlphaDeferred Comment - Use alpha masks where appropriate, in the deferred ('Lighting and Shadows') graphics mode + Use alpha masks where appropriate in the Advanced Lighting Model Persist 1 Type -- cgit v1.2.3 From 41ca92c67c75d86e8053ae45725d36ca3ac7e742 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Mon, 25 Mar 2013 18:27:07 -0500 Subject: NORSPEC-54 Potential fix for crashing on all sorts of random operations. --- indra/newview/app_settings/settings.xml | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index e80505740f..3259ac8718 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3182,17 +3182,6 @@ Value 1 - EnableTextureAtlas - - Comment - Whether to use texture atlas or not - Persist - 1 - Type - Boolean - Value - 0 - EnableUIHints Comment -- cgit v1.2.3 From 15852b88d990c980abd1ec4b66b4cc8cae4fd313 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Thu, 25 Apr 2013 18:21:08 -0500 Subject: Bump resolution on lightFunc to avoid banding. --- indra/newview/app_settings/settings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index eb5c9cc5c0..c064b420f3 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8471,7 +8471,7 @@ Type U32 Value - 512 + 1024 RenderSpecularResY @@ -8483,7 +8483,7 @@ Type U32 Value - 128 + 256 RenderSpecularExponent -- cgit v1.2.3 From 2aa3c592b02bf634a9faee95dc355a9e9166f2b1 Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Fri, 26 Apr 2013 15:32:31 -0700 Subject: Fix Xui cloud raining on sunshinybumpiness --- indra/newview/app_settings/settings.xml | 187 ++++++++++++++++++++++++++++++++ 1 file changed, 187 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index c064b420f3..448fdaadba 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -291,6 +291,17 @@ Value 1.0 + AudioLevelUnderwaterRolloff + + Comment + Controls the distance-based dropoff of audio volume underwater(fraction or multiple of default audio rolloff) + Persist + 1 + Type + F32 + Value + 5.0 + AudioLevelSFX Comment @@ -2003,6 +2014,39 @@ String Value + + DebugAvatarAppearanceMessage + + Comment + Dump a bunch of XML files when handling appearance messages + Persist + 1 + Type + Boolean + Value + 0 + + DebugAvatarExperimentalServerAppearanceUpdate + + Comment + Experiment with sending full cof_contents instead of cof_version + Persist + 1 + Type + Boolean + Value + 0 + + DebugAvatarAppearanceServiceURLOverride + + Comment + URL to use for baked texture requests; overrides value returned by login server. + Persist + 1 + Type + String + Value + DebugAvatarRezTime @@ -2025,6 +2069,17 @@ Boolean Value 1 + + DebugAvatarCompositeBaked + + Comment + Colorize avatar meshes based on baked/composite state. + Persist + 1 + Type + Boolean + Value + 0 DebugBeaconLineWidth @@ -2037,6 +2092,17 @@ Value 1 + DebugForceAppearanceRequestFailure + + Comment + Request wrong cof version to test the failure path for server appearance update requests. + Persist + 1 + Type + Boolean + Value + 0 + DebugHideEmptySystemFolders Comment @@ -4370,6 +4436,28 @@ Value 1.0 + InventoryDebugSimulateOpFailureRate + + Comment + Rate at which we simulate failures of copy/link requests in some operations + Persist + 1 + Type + F32 + Value + 0.0 + + InventoryDebugSimulateLateOpRate + + Comment + Rate at which we simulate late-completing copy/link requests in some operations + Persist + 1 + Type + F32 + Value + 0.0 + InventoryDisplayInbox Comment @@ -8892,6 +8980,28 @@ Value 1 + DisableAllRenderTypes + + Comment + Disables all rendering types. + Persist + 0 + Type + Boolean + Value + 0 + + DisableAllRenderFeatures + + Comment + Disables all rendering features. + Persist + 0 + Type + Boolean + Value + 0 + RenderHUDInSnapshot Comment @@ -13329,6 +13439,28 @@ Value -1 + MaxFPS + + Comment + Yield some time to the local host if we reach a threshold framerate. + Persist + 1 + Type + F32 + Value + -1.0 + + ForcePeriodicRenderingTime + + Comment + Periodically enable all rendering masks for a single frame. + Persist + 1 + Type + F32 + Value + -1.0 + ZoomDirect Comment @@ -14314,5 +14446,60 @@ Value 0 + DisablePrecacheDelayAfterTeleporting + + Comment + Disables the artificial delay in the viewer that precaches some incoming assets + Persist + 0 + Type + Boolean + Value + 0 + + FMODExProfilerEnable + + Comment + Enable profiler tool if using FMOD Ex + Persist + 1 + Type + Boolean + Value + 0 + + FMODExDecodeBufferSize + + Comment + Sets the streaming decode buffer size (in milliseconds) + Persist + 1 + Type + U32 + Value + 1000 + + FMODExStreamBufferSize + + Comment + Sets the streaming buffer size (in milliseconds) + Persist + 1 + Type + U32 + Value + 7000 + + DisablePrecacheDelayAfterTeleporting + + Comment + Disables the artificial delay in the viewer that precaches some incoming assets + Persist + 0 + Type + Boolean + Value + 0 + -- cgit v1.2.3 From 806d09b1143894ad66cea2c228f467e8c39a8adf Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Tue, 30 Apr 2013 19:50:05 -0700 Subject: Merge 3.5.1 into Materials --- indra/newview/app_settings/settings.xml | 187 ++++++++++++++++++++++++++++++++ 1 file changed, 187 insertions(+) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index c064b420f3..448fdaadba 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -291,6 +291,17 @@ Value 1.0 + AudioLevelUnderwaterRolloff + + Comment + Controls the distance-based dropoff of audio volume underwater(fraction or multiple of default audio rolloff) + Persist + 1 + Type + F32 + Value + 5.0 + AudioLevelSFX Comment @@ -2003,6 +2014,39 @@ String Value + + DebugAvatarAppearanceMessage + + Comment + Dump a bunch of XML files when handling appearance messages + Persist + 1 + Type + Boolean + Value + 0 + + DebugAvatarExperimentalServerAppearanceUpdate + + Comment + Experiment with sending full cof_contents instead of cof_version + Persist + 1 + Type + Boolean + Value + 0 + + DebugAvatarAppearanceServiceURLOverride + + Comment + URL to use for baked texture requests; overrides value returned by login server. + Persist + 1 + Type + String + Value + DebugAvatarRezTime @@ -2025,6 +2069,17 @@ Boolean Value 1 + + DebugAvatarCompositeBaked + + Comment + Colorize avatar meshes based on baked/composite state. + Persist + 1 + Type + Boolean + Value + 0 DebugBeaconLineWidth @@ -2037,6 +2092,17 @@ Value 1 + DebugForceAppearanceRequestFailure + + Comment + Request wrong cof version to test the failure path for server appearance update requests. + Persist + 1 + Type + Boolean + Value + 0 + DebugHideEmptySystemFolders Comment @@ -4370,6 +4436,28 @@ Value 1.0 + InventoryDebugSimulateOpFailureRate + + Comment + Rate at which we simulate failures of copy/link requests in some operations + Persist + 1 + Type + F32 + Value + 0.0 + + InventoryDebugSimulateLateOpRate + + Comment + Rate at which we simulate late-completing copy/link requests in some operations + Persist + 1 + Type + F32 + Value + 0.0 + InventoryDisplayInbox Comment @@ -8892,6 +8980,28 @@ Value 1 + DisableAllRenderTypes + + Comment + Disables all rendering types. + Persist + 0 + Type + Boolean + Value + 0 + + DisableAllRenderFeatures + + Comment + Disables all rendering features. + Persist + 0 + Type + Boolean + Value + 0 + RenderHUDInSnapshot Comment @@ -13329,6 +13439,28 @@ Value -1 + MaxFPS + + Comment + Yield some time to the local host if we reach a threshold framerate. + Persist + 1 + Type + F32 + Value + -1.0 + + ForcePeriodicRenderingTime + + Comment + Periodically enable all rendering masks for a single frame. + Persist + 1 + Type + F32 + Value + -1.0 + ZoomDirect Comment @@ -14314,5 +14446,60 @@ Value 0 + DisablePrecacheDelayAfterTeleporting + + Comment + Disables the artificial delay in the viewer that precaches some incoming assets + Persist + 0 + Type + Boolean + Value + 0 + + FMODExProfilerEnable + + Comment + Enable profiler tool if using FMOD Ex + Persist + 1 + Type + Boolean + Value + 0 + + FMODExDecodeBufferSize + + Comment + Sets the streaming decode buffer size (in milliseconds) + Persist + 1 + Type + U32 + Value + 1000 + + FMODExStreamBufferSize + + Comment + Sets the streaming buffer size (in milliseconds) + Persist + 1 + Type + U32 + Value + 7000 + + DisablePrecacheDelayAfterTeleporting + + Comment + Disables the artificial delay in the viewer that precaches some incoming assets + Persist + 0 + Type + Boolean + Value + 0 + -- cgit v1.2.3 From c334a185f331a3392c2d0ccaf8241166ef9d8049 Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Tue, 14 May 2013 05:59:48 -0700 Subject: NORSPEC-151 NORSPEC-152 fix handling of disable of bumpy and shiny in graphics panel to also disable deferred properly and add hooks for default norm and spec textures in texture picker --- indra/newview/app_settings/settings.xml | 47 +++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 2e53cf2da0..b82da4c5ab 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2862,6 +2862,28 @@ Value 0 + DefaultBlankNormalTexture + + Comment + Texture used as 'Blank' in texture picker for normal maps. (UUID texture reference) + Persist + 1 + Type + String + Value + 5b53359e-59dd-d8a2-04c3-9e65134da47a + + DefaultBlankSpecularTexture + + Comment + Texture used as 'Blank' in texture picker for specular maps. (UUID texture reference) + Persist + 1 + Type + String + Value + cd35472f-71fa-9b9c-8e73-a2c324f5751a + DefaultFemaleAvatar Comment @@ -2884,8 +2906,29 @@ Value Male Shape & Outfit - - DefaultObjectTexture + DefaultObjectNormalTexture + + Comment + Texture used as 'Default' in texture picker for normal map. (UUID texture reference) + Persist + 1 + Type + String + Value + 2d9dd1d8-9d57-3cfb-f965-f7613e702d8e + + DefaultObjectSpecularTexture + + Comment + Texture used as 'Default' in texture picker for specular map. (UUID texture reference) + Persist + 1 + Type + String + Value + e0491381-964c-0d68-1caa-91ab2f4c6d6a + + DefaultObjectTexture Comment Texture used as 'Default' in texture picker. (UUID texture reference) -- cgit v1.2.3 From f58b17cb29ec85ef15465e3ede27cae9ae3b203f Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Wed, 15 May 2013 15:03:39 -0700 Subject: NORSPEC-152 better default norm/spec textures which read better in the UI and provide better default spec feedback --- indra/newview/app_settings/settings.xml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index b82da4c5ab..e9b36ee5b1 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2872,17 +2872,6 @@ String Value 5b53359e-59dd-d8a2-04c3-9e65134da47a - - DefaultBlankSpecularTexture - - Comment - Texture used as 'Blank' in texture picker for specular maps. (UUID texture reference) - Persist - 1 - Type - String - Value - cd35472f-71fa-9b9c-8e73-a2c324f5751a DefaultFemaleAvatar @@ -2915,7 +2904,7 @@ Type String Value - 2d9dd1d8-9d57-3cfb-f965-f7613e702d8e + 85f28839-7a1c-b4e3-d71d-967792970a7b DefaultObjectSpecularTexture @@ -2926,7 +2915,7 @@ Type String Value - e0491381-964c-0d68-1caa-91ab2f4c6d6a + 87e0e8f7-8729-1ea8-cfc9-8915773009db DefaultObjectTexture -- cgit v1.2.3 From e32242ba52e6da23f987a9f7df4f42267cd5b5fb Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Mon, 3 Jun 2013 13:15:56 -0700 Subject: NORSPEC-227 fix settings XML merge derp --- indra/newview/app_settings/settings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 2d4ae5ea55..12ca902c59 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13491,7 +13491,7 @@ Type F32 Value - -1.0 + -1.0 ForcePeriodicRenderingTime @@ -13502,7 +13502,7 @@ Type F32 Value - -1.0 + -1.0 ZoomDirect -- cgit v1.2.3 From ccd04cd66c0a550694fefe41042ef47466780a92 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Tue, 18 Jun 2013 17:24:21 -0500 Subject: Occlusion culling overhaul. --- indra/newview/app_settings/settings.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview/app_settings/settings.xml') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 12ca902c59..344079b640 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -7732,7 +7732,7 @@ Type S32 Value - 4 + 3 OctreeAlphaDistanceFactor @@ -8504,7 +8504,6 @@ Value 1.0 - RenderDeferredTreeShadowBias Comment -- cgit v1.2.3