From c0ba626c8009b22310b3923e8170e5db2a021253 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Mon, 15 Oct 2012 21:34:29 -0600 Subject: For SH-3333: Design and implement a new object cache system on viewer side --- 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 7497a273ea..13c95c2381 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6400,6 +6400,17 @@ Value 1 + ObjectCacheViewCullingEnabled + + Comment + Enable the object cache view culling. Needs to restart viewer. + Persist + 1 + Type + Boolean + Value + 1 + OpenDebugStatAdvanced Comment -- cgit v1.2.3 From c180fe2ae2b5d2e00149f9902717e02ed7042143 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Mon, 19 Nov 2012 22:28:12 -0700 Subject: for SH-3561: capture the frame buffer contents and compare pixel differences between frames. --- indra/newview/app_settings/settings.xml | 14 +++++++++++++- 1 file changed, 13 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 13c95c2381..c6cfe3b616 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -9469,6 +9469,17 @@ Value 0 + SceneLoadingMonitorEnabled + + Comment + Enabled scene loading monitor if set + Persist + 0 + Type + Boolean + Value + 0 + ScriptHelpFollowsCursor Comment @@ -10864,7 +10875,7 @@ Type F32 Value - 0.0 + 0.0 TextureFetchUpdateSkipLowPriority @@ -12492,6 +12503,7 @@ Type LLSD Value + VFSOldSize -- cgit v1.2.3 From 6ae6abae26200c80a15d2e2d899ae6970602ff04 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Wed, 21 Nov 2012 13:29:15 -0700 Subject: more for SH-3571: display frame-to-frame pixel differences on screen --- 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 c6cfe3b616..7fc7a7ad3b 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -9474,7 +9474,7 @@ Comment Enabled scene loading monitor if set Persist - 0 + 1 Type Boolean Value -- cgit v1.2.3 From 43f063fe2c814e28da69f2f5c373497a6d621460 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 9 May 2013 17:19:05 -0700 Subject: SH-4080 WIP interesting: random crash on Mac added controls for curtain delay --- indra/newview/app_settings/settings.xml | 24 +++++++++++++++++++++++- 1 file changed, 23 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 94a8550938..8a1c37d242 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -19,7 +19,7 @@ Time before automatically setting AFK (away from keyboard) mode (seconds, 0=never). Valid values are: 0, 120, 300, 600, 1800 - + Persist 1 Type @@ -14117,5 +14117,27 @@ Value 0 + TeleportArrivalDelay + + Comment + Time to wait before displaying world during teleport (seconds) + Persist + 1 + Type + F32 + Value + 2 + + TeleportLocalDelay + + Comment + Delay to prevent teleports after starting an in-sim teleport. (seconds) + Persist + 1 + Type + F32 + Value + 1 + -- cgit v1.2.3 From 3a0e45ff088278cba5314974be6539b05009b8da Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Fri, 10 May 2013 17:57:12 -0700 Subject: SH-3931 WIP Interesting: Add graphs to visualize scene load metrics renamed LLView::handleVisibilityChange to onVisibilityChange to reflect standard naming conventions for handlers vs. reactors --- 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 8a1c37d242..ed8d0bf10d 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -9469,6 +9469,17 @@ Value 0 + SceneLoadingMonitorSampleTime + + Comment + Time between screen samples when monitor scene load (seconds) + Persist + 1 + Type + F32 + Value + 1 + ScriptHelpFollowsCursor Comment -- cgit v1.2.3 From 12c34dc30f0cb6270c11e100fcaceb3fa6b27e81 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 16 May 2013 00:53:01 -0700 Subject: SH-3931 WIP Interesting: Add graphs to visualize scene load metrics renamed LLView::handleVisibilityChange to onVisibilityChange to reflect cleaned up scene monitor stats recording, now all trace stats dumped to csv also fixed extendablerecording, periodicrecording, etc. to properly implement start/stop/etc --- indra/newview/app_settings/settings.xml | 25 +++++++++++++++++++++++-- 1 file changed, 23 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 ed8d0bf10d..94f032be67 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6847,6 +6847,17 @@ F32 Value 6.0 + + ClothingLoadingDelay + + Comment + Time to wait for avatar appearance to resolve before showing world (seconds) + Persist + 1 + Type + F32 + Value + 10.0 PreferredMaturity @@ -7403,7 +7414,6 @@ Value 1 - OctreeMaxNodeCapacity Comment @@ -9478,7 +9488,18 @@ Type F32 Value - 1 + 0.25 + + SceneLoadingPixelDiffThreshold + + Comment + Amount of pixels changed required to consider the scene as still loading (fraction of pixels on screen) + Persist + 1 + Type + F32 + Value + 0.0003 ScriptHelpFollowsCursor -- cgit v1.2.3 From b5f98560c796d62e45ebd0e410254b79958c7f47 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Thu, 23 May 2013 23:21:41 -0600 Subject: add a debug setting "UseObjectCacheOcclusion" to enable/disable object cache occlusion culling --- 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 94f032be67..8efc4a80e6 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12405,6 +12405,17 @@ Value 1 + UseObjectCacheOcclusion + + Comment + Enable object cache level object culling based on occlusion (coverage) by other objects + Persist + 1 + Type + Boolean + Value + 1 + RenderSynchronousOcclusion Comment -- cgit v1.2.3 From 9ed2f4d3cb02d5161bd8bb77cb7befa7feedf2d9 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Mon, 17 Jun 2013 15:24:15 -0600 Subject: add a debug setting "InvisibleObjectsInMemoryTime" to adjust the time invisible objects stay in memory. --- 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 4d5b0c62e4..29427bbaa3 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4590,6 +4590,17 @@ Value 0 + InvisibleObjectsInMemoryTime + + Comment + Number of frames invisible objects stay in memory before being removed. 0 means never to remove. + Persist + 1 + Type + U32 + Value + 64 + JoystickAvatarEnabled Comment -- cgit v1.2.3 From bd078122e3a87e958fb6b0ea9caeef885298d527 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Mon, 15 Jul 2013 21:00:19 -0700 Subject: SH-4299 FIX: Interesting: High fps shown temporarily off scale in statistics console timing of scene load recording extension now guaranteed > requested time step removed double add of recorded data removed spam --- 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 a255793017..5bbe56bc0e 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -9844,13 +9844,13 @@ SceneLoadingPixelDiffThreshold Comment - Amount of pixels changed required to consider the scene as still loading (fraction of pixels on screen) + Amount of pixels changed required to consider the scene as still loading (square root of fraction of pixels on screen) Persist 1 Type F32 Value - 0.0003 + 0.02 ScriptHelpFollowsCursor -- cgit v1.2.3 From 15fe4b3bbaf139960f934b629c236092182ed297 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Tue, 30 Jul 2013 22:05:12 -0600 Subject: fix for SH-4297: interesting: viewer-interesting starts loading cached scene late --- 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 f0be4e394e..2a4e10fb6f 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6295,6 +6295,17 @@ Value 130 + NewObjectCreationThrottle + + Comment + maximum number of new objects created per frame, -1 to disable this throttle + Persist + 1 + Type + S32 + Value + 64 + NextOwnerCopy Comment -- cgit v1.2.3 From b1297dce44ccf4b4875ec9ce0d9d78d563d877ee Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 27 Aug 2013 19:33:03 -0700 Subject: SH-4453 Interesting: SceneLoadingMonitorEnabled does not work until the camera turns made sceneloadingmonitor setting not persist --- 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 015c307afc..b2e3c8b683 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -9846,7 +9846,7 @@ Comment Enabled scene loading monitor if set Persist - 1 + 0 Type Boolean Value -- cgit v1.2.3 From 1751650dbcad4ea66b2c3779aa52960ec1640466 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Thu, 29 Aug 2013 13:14:56 -0600 Subject: add some debug settings for easier tuning up performance. --- indra/newview/app_settings/settings.xml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 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 b2e3c8b683..93cc605be0 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -721,6 +721,17 @@ 0 + BackDistanceFactor + + Comment + Keep invisible objects in memory which are in the distance range (the factor * draw_distance) to the camera + Persist + 1 + Type + F32 + Value + 0.125 + BackgroundYieldTime Comment @@ -732,6 +743,17 @@ Value 40 + BackProjectionAngleSquared + + Comment + squared tan(object bbox projection angle). that of invisible objects greater than this threshold are kept in memory + Persist + 1 + Type + F32 + Value + 0.0311 + BottomPanelNew Comment @@ -6306,6 +6328,17 @@ Value 64 + NewObjectCreationThrottleDelayTime + + Comment + time in seconds NewObjectCreationThrottle to take effect after the progress screen is lifted + Persist + 1 + Type + F32 + Value + 2.0 + NextOwnerCopy Comment -- cgit v1.2.3 From 754e8752a9b9a2e75d425a10cb8a0a6f85ad4bf5 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 3 Oct 2013 14:30:34 -0700 Subject: added initial memory usage tracking for lltrace --- 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 051cf6d43e..8642114362 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2983,6 +2983,17 @@ Value Female Shape & Outfit + DefaultLoginLocation + + Comment + Startup destination default (if not specified on command line) + Persist + 1 + Type + String + Value + + DefaultMaleAvatar Comment -- cgit v1.2.3 From c2521e41d794c53cd6f0cedcff17ca97737debe5 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Thu, 3 Oct 2013 15:40:09 -0600 Subject: change debug setting name "ObjectCacheViewCullingEnabled" to "RequestFullRegionCache" --- 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 051cf6d43e..305aaf2a3a 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6868,10 +6868,10 @@ Value 1 - ObjectCacheViewCullingEnabled + RequestFullRegionCache Comment - Enable the object cache view culling. Needs to restart viewer. + If set, ask sim to send full region object cache. Needs to restart viewer. Persist 1 Type -- cgit v1.2.3 From 9ae025f8ee8688b25678a243ba19f1398de08060 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Thu, 3 Oct 2013 16:21:54 -0600 Subject: add a debug setting: "BackShpereCullingRadius" --- 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 305aaf2a3a..14e96a06cc 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -765,6 +765,17 @@ Value 0.0311 + BackShpereCullingRadius + + Comment + Radius of back sphere in meters, objects behind camera but within this radius are loaded for rendering + Persist + 1 + Type + F32 + Value + 20.0 + BottomPanelNew Comment -- cgit v1.2.3 From c8067cfd9708fe30659b1f07f6d035508bea3033 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Wed, 9 Oct 2013 21:42:53 -0600 Subject: Enable the debug setting "NonvisibleObjectsInMemoryTime" --- indra/newview/app_settings/settings.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 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 27342712c6..7bfca2834b 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4753,18 +4753,7 @@ Boolean Value 0 - - InvisibleObjectsInMemoryTime - - Comment - Number of frames invisible objects stay in memory before being removed. 0 means never to remove. - Persist - 1 - Type - U32 - Value - 64 - + JoystickAvatarEnabled Comment @@ -6581,6 +6570,17 @@ Value 0 + NonvisibleObjectsInMemoryTime + + Comment + Number of frames non-visible objects stay in memory before being removed. 0 means never to remove. + Persist + 1 + Type + U32 + Value + 64 + NoPreload Comment -- cgit v1.2.3 From c8228b65f8a4a94220c92d89d1529ed484f6e84a Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Thu, 17 Oct 2013 20:21:17 -0600 Subject: fix for SH-4569: Objects are not culled by size in the distance --- 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 7bfca2834b..fb0d9c98d4 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -7114,7 +7114,17 @@ 0.75 - + ObjectProjectionAreaCutOFF + + Comment + Threshold in number of pixels of the projection area in screen of object bounding sphere. Objects smaller than this threshold are not rendered. + Persist + 1 + Type + F32 + Value + 1.0 + ParcelMediaAutoPlayEnable Comment -- cgit v1.2.3 From dc60a7564abf16cbf269e47cfc33ed00c6bb0870 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 24 Oct 2013 14:37:57 -0700 Subject: SH-4577 WIP Interesting: viewer crashed when clicking a offline Conversation containing a shared object potential fix by making instance tracker allow key collisions for LLToastNotifyPanel changed assertion macro to use original unpreprocessed source code renamed instance tracker behavior macros to use LL prefix added RestoreCameraPosOnLogin setting to optionally restore old camera positioning behavior --- indra/newview/app_settings/settings.xml | 13 ++++++++++++- 1 file changed, 12 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 fb0d9c98d4..09d74a7f5e 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1467,7 +1467,18 @@ 0.0 - CameraPositionSmoothing + RestoreCameraPosOnLogin + + Comment + Reset camera position to location at logout + Persist + 1 + Type + Boolean + Value + 0 + + CameraPositionSmoothing Comment Smooths camera position over time -- cgit v1.2.3 From c35801ef1c56b6c84063f47b490a8d2220b77ca7 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 5 Nov 2013 19:26:23 -0800 Subject: fixed focus issue on inventory --- indra/newview/app_settings/settings.xml | 44 --------------------------------- 1 file changed, 44 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 09d74a7f5e..df9dd3e1b5 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12004,50 +12004,6 @@ Value 1 - UIAvatariconctrlSymbolHPad - - Comment - UI Avatar Icon Control Symbol Horizontal Pad - Persist - 1 - Type - S32 - Value - 2 - - UIAvatariconctrlSymbolVPad - - Comment - UI Avatar Icon Control Symbol Vertical Pad - Persist - 1 - Type - S32 - Value - 2 - - UIAvatariconctrlSymbolSize - - Comment - UI Avatar Icon Control Symbol Size - Persist - 1 - Type - S32 - Value - 5 - - UIAvatariconctrlSymbolPosition - - Comment - UI Avatar Icon Control Symbol Position (TopLeft|TopRight|BottomLeft|BottomRight) - Persist - 1 - Type - String - Value - BottomRight - UIButtonOrigHPad Comment -- cgit v1.2.3 From 463a8930c8bddd8740478f6400561a48220ee584 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Wed, 6 Nov 2013 09:42:06 -0700 Subject: re-organize the code of processing the debug setting "ObjectProjectionAreaCutOff" --- 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 09d74a7f5e..c87da95d41 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -7125,7 +7125,7 @@ 0.75 - ObjectProjectionAreaCutOFF + ObjectProjectionAreaCutOff Comment Threshold in number of pixels of the projection area in screen of object bounding sphere. Objects smaller than this threshold are not rendered. -- cgit v1.2.3 From 22beac78135e23ede5002f4125e2c3006bcad7f2 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Wed, 6 Nov 2013 10:02:58 -0700 Subject: increase the default value of "ObjectProjectionAreaCutOff" to be 16 pixels. --- 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 c87da95d41..04be4e5f00 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -7134,7 +7134,7 @@ Type F32 Value - 1.0 + 16.0 ParcelMediaAutoPlayEnable -- cgit v1.2.3 From 2cb781705e56e31e11c4c37891b2ac86326aa411 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Wed, 6 Nov 2013 10:18:06 -0700 Subject: remove some unused debug settings. --- indra/newview/app_settings/settings.xml | 23 ----------------------- 1 file changed, 23 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 04be4e5f00..db7be5abc4 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -731,18 +731,6 @@ Value 0 - - BackDistanceFactor - - Comment - Keep invisible objects in memory which are in the distance range (the factor * draw_distance) to the camera - Persist - 1 - Type - F32 - Value - 0.125 - BackgroundYieldTime Comment @@ -754,17 +742,6 @@ Value 40 - BackProjectionAngleSquared - - Comment - squared tan(object bbox projection angle). that of invisible objects greater than this threshold are kept in memory - Persist - 1 - Type - F32 - Value - 0.0311 - BackShpereCullingRadius Comment -- cgit v1.2.3 From d71cafa4bcecb311bce626a15dd185e4750994ea Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Wed, 6 Nov 2013 20:05:28 -0800 Subject: final settings tweaks renamed BackShpereCullingRadius to BackSphereCullingRadius --- indra/newview/app_settings/settings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 7b30bbebab..14384edc1f 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -742,7 +742,7 @@ Value 40 - BackShpereCullingRadius + BackSphereCullingRadius Comment Radius of back sphere in meters, objects behind camera but within this radius are loaded for rendering @@ -751,7 +751,7 @@ Type F32 Value - 20.0 + 100.0 BottomPanelNew @@ -6456,7 +6456,7 @@ Type S32 Value - 64 + 200 NewObjectCreationThrottleDelayTime @@ -6577,7 +6577,7 @@ Type U32 Value - 64 + 300 NoPreload @@ -7121,7 +7121,7 @@ Type F32 Value - 16.0 + 100.0 ParcelMediaAutoPlayEnable -- cgit v1.2.3 From 83c2098fb99c4a4d33dfa5f4a71ab64ca39b547f Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Mon, 11 Nov 2013 14:50:32 -0700 Subject: fix for SH-4607: Create new object cache tuning parameters --- indra/newview/app_settings/settings.xml | 66 ++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 22 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 14384edc1f..adcea5103e 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -742,17 +742,6 @@ Value 40 - BackSphereCullingRadius - - Comment - Radius of back sphere in meters, objects behind camera but within this radius are loaded for rendering - Persist - 1 - Type - F32 - Value - 100.0 - BottomPanelNew Comment @@ -7111,17 +7100,6 @@ 0.0 0.75 - - ObjectProjectionAreaCutOff - - Comment - Threshold in number of pixels of the projection area in screen of object bounding sphere. Objects smaller than this threshold are not rendered. - Persist - 1 - Type - F32 - Value - 100.0 ParcelMediaAutoPlayEnable @@ -10231,6 +10209,17 @@ Value 0 + SceneLoadFrontPixelThreshold + + Comment + in pixels, all objects in view frustum whose screen area is greater than this threshold will be loaded + Persist + 1 + Type + F32 + Value + 100.0 + SceneLoadingMonitorEnabled Comment @@ -10264,6 +10253,39 @@ Value 0.02 + SceneLoadMinRadius + + Comment + in meters, all objects (visible or invisible) within this radius will remain loaded in memory + Persist + 1 + Type + F32 + Value + 16.0 + + SceneLoadRearMaxRadiusFraction + + Comment + a percentage of draw distance beyond which all objects outside of view frustum will be unloaded, regardless of pixel threshold + Persist + 1 + Type + F32 + Value + 20.0 + + SceneLoadRearPixelThreshold + + Comment + in pixels, all objects out of view frustum whose screen area is greater than this threshold will remain loaded + Persist + 1 + Type + F32 + Value + 200.0 + ScriptHelpFollowsCursor Comment -- cgit v1.2.3 From 5be20dd02415462991b26fb1aadf595a129661de Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Wed, 13 Nov 2013 16:18:59 -0800 Subject: moved SceneLoadingMonitor settings vars (and renamed SceneLoadingPixelDiffThreshold to SceneLoadingMonitorPixelDiffThreshold) tweaked layout of floater_model_preview.xml --- indra/newview/app_settings/settings.xml | 70 ++++++++++++++++----------------- 1 file changed, 35 insertions(+), 35 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 789a504c39..6a84c4fca0 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6440,7 +6440,7 @@ Comment Search radius for nearby avatars - Persist + Persist 1 Type F32 @@ -10231,39 +10231,6 @@ Value 100.0 - SceneLoadingMonitorEnabled - - Comment - Enabled scene loading monitor if set - Persist - 0 - Type - Boolean - Value - 0 - - SceneLoadingMonitorSampleTime - - Comment - Time between screen samples when monitor scene load (seconds) - Persist - 1 - Type - F32 - Value - 0.25 - - SceneLoadingPixelDiffThreshold - - Comment - Amount of pixels changed required to consider the scene as still loading (square root of fraction of pixels on screen) - Persist - 1 - Type - F32 - Value - 0.02 - SceneLoadMinRadius Comment @@ -10297,7 +10264,40 @@ Value 200.0 - ScriptHelpFollowsCursor + SceneLoadingMonitorEnabled + + Comment + Enabled scene loading monitor if set + Persist + 0 + Type + Boolean + Value + 0 + + SceneLoadingMonitorSampleTime + + Comment + Time between screen samples when monitor scene load (seconds) + Persist + 1 + Type + F32 + Value + 0.25 + + SceneLoadingMonitorPixelDiffThreshold + + Comment + Amount of pixels changed required to consider the scene as still loading (square root of fraction of pixels on screen) + Persist + 1 + Type + F32 + Value + 0.02 + + ScriptHelpFollowsCursor Comment Scripting help window updates contents based on script editor contents under text cursor -- cgit v1.2.3 From d6e96417a142441f8a8c414b0131c9fd95ecac7a Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 19 Nov 2013 19:45:59 -0800 Subject: SH-4606 FIX: Interesting: Small objects do not load until they are very close. finished fine tuning of new interest list parameters --- 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 6a84c4fca0..df2079a6e4 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10240,7 +10240,7 @@ Type F32 Value - 16.0 + 20.0 SceneLoadRearMaxRadiusFraction @@ -10251,7 +10251,7 @@ Type F32 Value - 20.0 + 75.0 SceneLoadRearPixelThreshold @@ -10262,7 +10262,7 @@ Type F32 Value - 200.0 + 400.0 SceneLoadingMonitorEnabled -- cgit v1.2.3 From 29476d29c4c78a6417c45090bdc6ea14c8251d73 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 3 Dec 2013 10:52:22 -0800 Subject: SH-4606 FIX Interesting: Small objects do not load until they are very close. increased SceneLoadMinRadius to 32 changes logic so that falloff starts at SceneLoadMinRadius added timing to pixel threshold calculation --- 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 df2079a6e4..f7af39d486 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10240,7 +10240,7 @@ Type F32 Value - 20.0 + 32.0 SceneLoadRearMaxRadiusFraction -- cgit v1.2.3 From 6661628d5c68855ddffc54a3f2578f93ada84de1 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Wed, 12 Feb 2014 20:50:32 -0700 Subject: add two debug settings: "SceneLoadLowMemoryBound" and "SceneLoadHighMemoryBound" --- indra/newview/app_settings/settings.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 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 325cdb3a03..83fc639050 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10231,6 +10231,28 @@ Value 100.0 + SceneLoadHighMemoryBound + + Comment + in MB, when total memory usage above this threshold, minimum invisible objects are kept in memory + Persist + 1 + Type + U32 + Value + 1024 + + SceneLoadLowMemoryBound + + Comment + in MB, when total memory usage above this threshold, start to reduce invisible objects kept in memory + Persist + 1 + Type + U32 + Value + 750 + SceneLoadMinRadius Comment -- cgit v1.2.3