From b92dd27878c73d23dec9859b317babfde749b33b Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Sun, 23 Nov 2014 12:11:51 -0500 Subject: STORM-2082 Allow saving and loading of graphic settings --- 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 f2fb9e854f..2e8737f0d7 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -9737,13 +9737,13 @@ RenderTerrainDetail Comment - Detail applied to terrain texturing (0 = none, 1 or 2 = full) + Detail applied to terrain texturing (0 = none, 1 = full) Persist 1 Type S32 Value - 2 + 1 RenderTerrainLODFactor -- cgit v1.2.3 From ea0216f67c12195aadb1993180c28c43b04294bd Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Tue, 25 Nov 2014 16:33:53 -0500 Subject: STORM-2082 Add tab containers, remove buttons and obsolete debug setting --- 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 2e8737f0d7..17b43901a9 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10529,17 +10529,6 @@ Value 0 - ShowAdvancedGraphicsSettings - - Comment - Show advanced graphics settings - Persist - 1 - Type - Boolean - Value - 0 - ShowAllObjectHoverTip Comment -- cgit v1.2.3 From c71cf9cf23ff7a9928695367e9b62db3bed38ed7 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 1 Dec 2014 13:45:48 -0500 Subject: Improve display of avatar rendering info, remove last use of RenderAutoMuteFunctions --- 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 17b43901a9..31890ca205 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -9911,17 +9911,6 @@ Value 0 - RenderAutoMuteFunctions - - Comment - Developing feature to render some avatars using simple impostors or colored silhouettes. (Set to 7 for all functionality) - Persist - 1 - Type - U32 - Value - 0 - RenderAutoMuteLogging Comment -- cgit v1.2.3 From cc22efa4c0d6b06bac6f49b6243df7726f89c7c4 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Wed, 3 Dec 2014 06:35:46 -0500 Subject: STORM-2082 Remove Apply button. Add new control variable to track which preset is active. Save settings to active preset when clicking on Ok button. Initial work to make pulldown operational. Still to do: add pretty icon for current preset. Notifications do not appear when called from this panel. --- indra/newview/app_settings/settings.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (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 31890ca205..6016839875 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -15551,7 +15551,17 @@ Value 0 - + PresetGraphicActive + + Comment + Name of currently selected preference + Persist + 1 + Type + String + Value + + -- cgit v1.2.3 From 8d12072979ee46a1eb2d13fdfef8bef62ff3f619 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 12 Dec 2014 11:13:11 -0500 Subject: STORM-2082 Merge Hardware floater into main graphics preferences display Change notifications so they are emitted only when an error occurs Put active preset at top of list Add Maximum ARC slider Merge two small methods into slider update code --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 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 6016839875..276a65edc5 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -15562,6 +15562,17 @@ Value + MaximumARC + + Comment + Controls RenderAutoMuteRenderWeightLimit in a non-linear fashion + Persist + 1 + Type + U32 + Value + 0 + -- cgit v1.2.3 From a976c9f502723649c7d74ddfd4e0c61c17a38e15 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 29 Jan 2015 11:54:28 -0500 Subject: add default values (some sensitive to graphics setting) for avatar rendering limits --- indra/newview/app_settings/settings.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 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 276a65edc5..b78cb01d85 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8298,7 +8298,9 @@ RenderAvatarMaxVisible Comment - Maximum number of avatars to display at any one time + Maximum number of avatars to fully render at one time; + over this limit uses impostor rendering (simplified rendering + with less frequent updates) Persist 1 Type @@ -9887,7 +9889,7 @@ Type U32 Value - 0 + 10000000 RenderAutoMuteRenderWeightLimit @@ -9931,7 +9933,7 @@ Type F32 Value - 0 + 1.0E6 RenderVBOEnable -- cgit v1.2.3 From 71a38e3a76f472e652c9ca43d948e5a90ebbcff3 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 3 Feb 2015 07:04:22 -0800 Subject: remove unused RenderAvatarComplexityLimit; replace with visual muting based on render weight --- 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 b78cb01d85..c2c93bbb80 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8202,17 +8202,6 @@ Value 1 - RenderAvatarComplexityLimit - - Comment - Max visual complexity of avatars in a scene - Persist - 1 - Type - S32 - Value - -1 - RenderComplexityColorMin Comment -- cgit v1.2.3 From 3cf8a1ce6e81c30cf7231a5ab045bbc45c6757e2 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 20 Feb 2015 12:56:45 -0500 Subject: Clean up impostors and visual muting Rename the settings that control them to be more descriptive Remove the separate boolean setting (RenderUseImpostors) that governed both Establish default values based on gpu class for impostors and visual muting --- indra/newview/app_settings/settings.xml | 99 ++++++++++++++++++++++----------- 1 file changed, 67 insertions(+), 32 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 0c5126574f..de81f8f0ee 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8287,15 +8287,13 @@ RenderAvatarMaxVisible Comment - Maximum number of avatars to fully render at one time; - over this limit uses impostor rendering (simplified rendering - with less frequent updates) + OBSOLETE and UNUSED. See RenderAvatarMaxNonImpostors Persist - 1 + 0 Type S32 Value - 12 + 0 RenderAvatarPhysicsLODFactor @@ -9846,29 +9844,28 @@ Value 0 - RenderUseFarClip - - Comment - If false, frustum culling will ignore far clip plane. - Persist - 1 - Type - Boolean - Value - 1 - - RenderUseImpostors - - Comment - Whether we want to use impostors for far away avatars. - Persist - 1 - Type - Boolean - Value - 1 - - + RenderUseFarClip + + Comment + If false, frustum culling will ignore far clip plane. + Persist + 1 + Type + Boolean + Value + 1 + + RenderUseImpostors + + Comment + OBSOLETE and UNUSED. See RenderAvatarMaxNonImpostors and RenderAvatarMaxComplexity. + Persist + 0 + Type + Boolean + Value + 0 + RenderAutoMuteByteLimit Comment @@ -9880,10 +9877,35 @@ Value 10000000 + RenderAvatarMaxNonImpostors + + Comment + Maximum number of avatars to fully render at one time; + over this limit uses impostor rendering (simplified rendering + with less frequent updates), reducing client lag. + Persist + 1 + Type + U32 + Value + 12 + RenderAutoMuteRenderWeightLimit Comment - Maximum render weight before an avatar is rendered as a simple impostor (0 to not use this limit). + OBSOLETE. This setting has been renamed RenderAvatarMaxNonImpostors. + Persist + 0 + Type + U32 + Value + 0 + + RenderAvatarMaxComplexity + + Comment + Maximum Avatar Complexity; above this value, the avatar is + rendered as a solid color outline (0 to disable this limit). Persist 1 Type @@ -15575,12 +15597,25 @@ Value - MaximumARC + IndirectMaxComplexity Comment - Controls RenderAutoMuteRenderWeightLimit in a non-linear fashion + Controls RenderAvatarMaxComplexity in a non-linear fashion (do + not set this value) Persist - 1 + 0 + Type + U32 + Value + 0 + + IndirectMaxNonImpostors + + Comment + Controls RenderAvatarMaxNonImpostors in a non-linear fashion (do + not set this value) + Persist + 0 Type U32 Value -- cgit v1.2.3 From c50aab4a265643d9d03ae4d0066f853fc5d996eb Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 26 Aug 2015 16:57:28 -0400 Subject: refine messages per MAINT-5376 (no percentage) --- indra/newview/app_settings/settings.xml | 11 +++++------ 1 file changed, 5 insertions(+), 6 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 800af06cf3..405848edc8 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8276,7 +8276,7 @@ RenderComplexityColorMin Comment - Max visual complexity of avatars in a scene + Unused obsolete setting Persist 1 Type @@ -8292,7 +8292,7 @@ RenderComplexityColorMid Comment - Max visual complexity of avatars in a scene + Unused obsolete setting Persist 1 Type @@ -8308,7 +8308,7 @@ RenderComplexityColorMax Comment - Max visual complexity of avatars in a scene + Unused obsolete setting Persist 1 Type @@ -8324,7 +8324,7 @@ RenderComplexityThreshold Comment - Only color objects higher than render threshold + Unused obsolete setting Persist 1 Type @@ -8335,8 +8335,7 @@ RenderComplexityStaticMax Comment - Sets a static max value for scaling of RenderComplexity - display (-1 for dynamic scaling) + Unused obsolete setting Persist 1 Type -- cgit v1.2.3 From 5284beac00ae311aa4cf9e11c0f0c313c6ea7456 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 31 Aug 2015 17:25:58 -0400 Subject: fix type --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 405848edc8..7370638299 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -9992,7 +9992,7 @@ Type F32 Value - 0 + 0.0 RenderAutoMuteLogging -- cgit v1.2.3 From d81383b46824404cf01c097324e8c1bc2cb0cece Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 11 Sep 2015 11:13:21 -0400 Subject: document ShowMyComplexityChanges setting --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 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 7370638299..f33ebb40c2 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -9971,6 +9971,17 @@ Value 0 + ShowMyComplexityChanges + + Comment + How long to show notices about avatar complexity (set to zero to disable those notices) + Persist + 1 + Type + U32 + Value + 20 + RenderAvatarMaxComplexity Comment -- cgit v1.2.3 From e1ce065b8b2f4a01a166ddd90ef7c873e04d0893 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 25 Sep 2015 16:10:11 -0400 Subject: MAINT-5673: set correct default for RenderAutoMuteSurfaceAreaLimit --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 f33ebb40c2..4f1b5ba0dc 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10003,7 +10003,7 @@ Type F32 Value - 0.0 + 1.0E6 RenderAutoMuteLogging -- cgit v1.2.3 From 14deeb4955a7eb7d6b7a4edff63fee036c19f1a1 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 6 Oct 2015 15:52:45 -0400 Subject: MAINT-5673: increase RenderAutoMuteSurfaceAreaLimit to 10 Million --- 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 9641165e8a..a6fa67cb9a 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10036,7 +10036,7 @@ Type F32 Value - 1.0E6 + 10.0E6 RenderAutoMuteLogging @@ -10058,7 +10058,7 @@ Type F32 Value - 1.0E6 + 10.0E6 RenderVBOEnable -- cgit v1.2.3 From ca7631e4d71c693a5a502c05a482ab01ada7888a Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 1 Mar 2016 16:01:21 -0500 Subject: MAINT-6183: Remove geometry bytes as a trigger for muted/impostor rendering --- indra/newview/app_settings/settings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 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 27cead9879..bb8b810b93 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -9972,13 +9972,13 @@ RenderAutoMuteByteLimit Comment - Maximum bytes of attachments before an avatar is rendered as a simple impostor (0 for no limit). + OBSOLETE and UNUSED. Persist - 1 + 0 Type U32 Value - 10000000 + 0 RenderAvatarMaxNonImpostors -- cgit v1.2.3 From 09f43945d598b50a31bdbe4a3f86c73d909ec9bc Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 4 Mar 2016 16:42:41 -0500 Subject: MAINT-5721: set new (much lower) limits for RenderAutoMuteSurfaceAreaLimit, but also disable if RenderAvatarMaxComplexity is unlimited (zero) --- indra/newview/app_settings/settings.xml | 6 ++++-- 1 file changed, 4 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 bb8b810b93..ef6107b1d5 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10030,13 +10030,15 @@ RenderAutoMuteSurfaceAreaLimit Comment - Maximum surface area of attachments before an avatar is rendered as a simple impostor (0 to not use this limit). + Maximum surface area of attachments before an avatar is + rendered as a simple impostor (to not use this limit, set to zero + or set RenderAvatarMaxComplexity to zero). Persist 1 Type F32 Value - 10.0E6 + 1000.0 RenderAutoMuteLogging -- cgit v1.2.3