From 188b778abcd4d06a9fcfcf0eee0cce8ccf00ed9b Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Thu, 29 Sep 2016 21:34:36 +0300 Subject: MAINT-6770 Remember appearance floater's chosen tab across logins --- 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 674923e88d..797b866724 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5241,6 +5241,17 @@ Value 0 + LastAppearanceTab + + Comment + Last selected tab in appearance floater + Persist + 1 + Type + S32 + Value + 0 + LastMediaSettingsTab Comment -- cgit v1.2.3 From 617bc0eded9b8df2d800a75eab107c079c468e9f Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Tue, 4 Oct 2016 19:07:05 +0300 Subject: MAINT-6779 Allow to use last pic from Abuse report floater after relog --- indra/newview/app_settings/settings_per_account.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index fd6b1b5b3f..bed392d738 100644 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -242,6 +242,17 @@ Value 0 + PreviousScreenshotForReport + + Comment + Use Previous Screenshot for Abuse report + Persist + 1 + Type + Boolean + Value + 0 + TranslatingEnabled Comment @@ -347,6 +348,5 @@ Value 1 - -- cgit v1.2.3 From 4040b452a37622feec0ad1d4eeb0492c636d1cd5 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Wed, 16 Nov 2016 15:54:00 +0200 Subject: MAINT-6872 Account for CTRL+0 zoom when mesh LOD is calculated --- 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 7af0067f5b..399a4bf5ac 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4614,6 +4614,17 @@ Value 1 + IgnoreFOVZoomForLODs + + Comment + Ignore zoom effect(CTRL+0) when calculating lods. + Persist + 1 + Type + Boolean + Value + 0 + IgnoreAllNotifications Comment -- cgit v1.2.3 From ef7ddc9407bfd4d19aeb73a61f1b7a077879c70a Mon Sep 17 00:00:00 2001 From: pavelkproductengine Date: Fri, 9 Dec 2016 19:31:30 +0200 Subject: MAINT-6551 One of my avatars does not render correctly when ALM is disabled unless basic shaders are also disabled. --- .../shaders/class1/lighting/lightAlphaMaskNonIndexedF.glsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskNonIndexedF.glsl b/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskNonIndexedF.glsl index b9ddbc8e1c..8918182853 100644 --- a/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskNonIndexedF.glsl +++ b/indra/newview/app_settings/shaders/class1/lighting/lightAlphaMaskNonIndexedF.glsl @@ -43,12 +43,12 @@ void default_lighting() { vec4 color = texture2D(diffuseMap,vary_texcoord0.xy); + color *= vertex_color; + if (color.a < minimum_alpha) { discard; } - - color.rgb *= vertex_color.rgb; color.rgb = atmosLighting(color.rgb); -- cgit v1.2.3 From ffccd4a2ecdebba16a2fc06f84f04fb85389f24f Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Thu, 15 Dec 2016 02:41:14 +0200 Subject: Backed out changeset: f73be0eb9d00 --- indra/newview/app_settings/settings.xml | 11 ----------- 1 file changed, 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 04fb1fb238..9f37c3487e 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4636,17 +4636,6 @@ Value 1 - IgnoreFOVZoomForLODs - - Comment - Ignore zoom effect(CTRL+0) when calculating lods. - Persist - 1 - Type - Boolean - Value - 0 - IgnoreAllNotifications Comment -- cgit v1.2.3 From 05c2c408a4a8a2ba67d3b3071aac9d50af77a962 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Tue, 27 Dec 2016 16:10:42 +0200 Subject: MAINT-3027 remove CameraAspectRatio from Debug Settings --- indra/newview/app_settings/settings.xml | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 9f37c3487e..6d8b642d6f 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1608,18 +1608,6 @@ 60.0 - CameraAspectRatio - - Comment - Camera aspect ratio for DoF effect - Persist - 1 - Type - F32 - Value - 1.5 - - CertStore Comment -- cgit v1.2.3 From 7c70236fe0f24ede06022fcafee53e1815804ce3 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Wed, 4 Jan 2017 10:51:17 +0200 Subject: MAINT-838 Removing obsolete and malfunctioning leftClickShowMenu --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 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 6d8b642d6f..8ddb421ac3 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5376,7 +5376,7 @@ LeftClickShowMenu Comment - Left click opens pie menu (FALSE = left click touches or grabs object) + Unused obsolete setting Persist 1 Type -- cgit v1.2.3 From 078f5d3c2aab2d2b4ecb7747b58bb1853c193e3e Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Tue, 17 Jan 2017 14:47:00 +0200 Subject: MAINT-275 Allow showing Beacons floater in mouse look --- indra/newview/app_settings/settings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 8ddb421ac3..1b09e44644 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -14732,6 +14732,7 @@ snapshot postcard mini_map + beacons LandmarksSortedByDate -- cgit v1.2.3 From d4b7c6bfd503a1c7904ce658b4c1f120689e5fd9 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Tue, 24 Jan 2017 12:35:52 +0200 Subject: MAINT-7067 Issue with UI artifacts showing up in Abuse Report screenshots. --- 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 1b09e44644..717deba8c7 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11812,6 +11812,17 @@ Value 75 + AbuseReportScreenshotDelay + + Comment + Time delay before taking screenshot to avoid UI artifacts. + Persist + 1 + Type + F32 + Value + 0.3 + SpeedTest Comment -- cgit v1.2.3 From b94aa751c93b2c9bf9a9567946fe388a7c475d77 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Tue, 17 Jan 2017 20:11:00 +0200 Subject: MAINT-6959 Ability to set custom folders for uploading items --- .../newview/app_settings/settings_per_account.xml | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index eee13fb28e..92e61d2e86 100644 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -348,5 +348,49 @@ Value 1 + ModelUploadFolder + + Comment + All model uploads will be stored in this directory (UUID) + Persist + 1 + Type + String + Value + + + TextureUploadFolder + + Comment + All image(texture) uploads will be stored in this directory (UUID) + Persist + 1 + Type + String + Value + + + SoundUploadFolder + + Comment + All sound uploads will be stored in this directory (UUID) + Persist + 1 + Type + String + Value + + + AnimationUploadFolder + + Comment + All animation uploads will be stored in this directory (UUID) + Persist + 1 + Type + String + Value + + -- cgit v1.2.3 From 85c24a489dd0550db253f442fc5e22a6494b7cd7 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Mon, 6 Feb 2017 13:04:22 +0200 Subject: MAINT-7104 Add Grid status floater and toolbar button --- indra/newview/app_settings/commands.xml | 10 ++++++++++ indra/newview/app_settings/settings.xml | 16 ++++++++++++++++ 2 files changed, 26 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 9bc0a7c701..64cd11a53a 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -292,4 +292,14 @@ is_running_function="Floater.IsOpen" is_running_parameters="reporter" /> + diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 717deba8c7..e96401b511 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -15125,6 +15125,22 @@ 0 + GridStatusFloaterRect + + Comment + Web profile floater dimensions + Persist + 1 + Type + Rect + Value + + 0 + 520 + 625 + 0 + + HelpFloaterOpen Comment -- cgit v1.2.3 From 67edb011b5b803c21652c9735e03a387f26a77d5 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Tue, 14 Feb 2017 13:37:45 +0200 Subject: MAINT-7104 Flash toolbar when grid status page is updated --- indra/newview/app_settings/commands.xml | 1 + indra/newview/app_settings/settings.xml | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 64cd11a53a..412d3a53b3 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -294,6 +294,7 @@ /> Value http://wiki.secondlife.com/wiki/[LSL_STRING] + GridStatusRSS + + Comment + URL that points to SL Grid Status RSS + Persist + 1 + Type + String + Value + https://secondlife-status.statuspage.io/history.atom + + GridStatusUpdateDelay + + Comment + Timer delay for updating Grid Status RSS. + Persist + 1 + Type + F32 + Value + 60.0 + + TestGridStatusRSSFromFile + + Comment + For testing only: Don't update rss xml file from server. + Persist + 1 + Type + Boolean + Value + 0 + LagMeterShrunk Comment -- cgit v1.2.3 From d23b6e442e0a4d3a8badb51efd7611e23d138b26 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Wed, 15 Mar 2017 12:08:30 +0200 Subject: MAINT-7168 Avatar rendering settings adjustments --- 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 fb644d3d5a..097a9ac7b9 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8426,6 +8426,17 @@ Value 1 + AlwaysRenderFriends + + Comment + Always render friends regardless of max complexity + Persist + 1 + Type + Boolean + Value + 0 + RenderAvatar Comment -- cgit v1.2.3 From 7980dedc3205d2c1a7596d4cad3fa3f7fff383a5 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Thu, 30 Mar 2017 20:11:28 +0300 Subject: MAINT-728 Allows multiple dialogs per script --- 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 097a9ac7b9..db2d48bd12 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10734,6 +10734,17 @@ Value 1 + ScriptDialogLimitations + + Comment + Limits amount of dialogs per script (0 - per object, 1 - per channel, 2 - per channel for attachments, 3 - per channel for HUDs, 4 -unconstrained for HUDs) + Persist + 1 + Type + U32 + Value + 0 + SecondLifeEnterprise Comment -- cgit v1.2.3 From 26809498db128f2f69da3d04ae2b736f78f6e13a Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Wed, 5 Apr 2017 14:29:35 +0300 Subject: MAINT-3595 Add the ability to turn off auto-complete of gestures in local chat --- 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 db2d48bd12..c086e71fae 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1619,6 +1619,17 @@ Value default + ChatAutocompleteGestures + + Comment + Auto-complete gestures in nearby chat + Persist + 1 + Type + Boolean + Value + 1 + ChatBarStealsFocus Comment -- cgit v1.2.3 From 22b03279a127db6bfce22680ee85d8867da5a883 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Thu, 13 Apr 2017 18:25:31 +0300 Subject: MAINT-7313 Connect the recent per attachment reported render weight cap to a debug setting. --- 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 c086e71fae..f0a91fd407 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10179,6 +10179,17 @@ Value 10 + MaxAttachmentComplexity + + Comment + Attachment's render weight limit + Persist + 1 + Type + F32 + Value + 1.0E6 + ComplexityChangesPopUpDelay Comment -- cgit v1.2.3 From 69db7cd947a6b272004f7a02a0f45527dba0fdbd Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Thu, 27 Apr 2017 17:26:32 +0300 Subject: MAINT-3223 Texture repeats synch feature --- 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 f0a91fd407..89f5d7a24f 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11878,6 +11878,17 @@ Value 0 + SyncMaterialSettings + + Comment + SyncMaterialSettings + Persist + 1 + Type + Boolean + Value + 0 + SnapshotQuality Comment -- cgit v1.2.3 From 288f93c7e0aa605464ddb09a3cdca504c0805c48 Mon Sep 17 00:00:00 2001 From: pavelkproductengine Date: Tue, 2 May 2017 19:55:24 +0300 Subject: MAINT-7351 New Default volume for Streaming Music & Media --- 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 89f5d7a24f..962537bc12 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -333,7 +333,7 @@ Type F32 Value - 0.5 + 0.3 AudioLevelMic @@ -355,7 +355,7 @@ Type F32 Value - 0.5 + 0.3 AudioLevelRolloff -- cgit v1.2.3 From b59ac959fcf2f1f0435f965d2c7279f529f1ce5c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 27 Apr 2017 19:19:11 +0200 Subject: MAINT-6519 Contribution, adds feature to replace inventory links --- indra/newview/app_settings/settings.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 962537bc12..f490551406 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5450,6 +5450,28 @@ Value 1 + LinkReplaceBatchSize + + Comment + The maximum size of a batch in a link replace operation + Persist + 1 + Type + U32 + Value + 25 + + LinkReplaceBatchPauseTime + + Comment + The time in seconds between two batches in a link replace operation + Persist + 1 + Type + F32 + Value + 1.0 + LipSyncAah Comment -- cgit v1.2.3 From b7b8d6e1aedeac1dfdfcc9200024bbcc8e2dacae Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 26 Apr 2017 12:39:14 -0400 Subject: MAINT-7343 - added periodic logging of state of the asset store. --- 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 097a9ac7b9..d2d629339d 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -14639,6 +14639,17 @@ Value 0 + AssetStorageLogFrequency + + Comment + Seconds between display of AssetStorage info in log (0 for never) + Persist + 1 + Type + F32 + Value + 60.0 + LogWearableAssetSave Comment -- cgit v1.2.3 From 9dfb5614e640b3350d89500b7d7486e2065ed7e2 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Fri, 28 Apr 2017 16:10:24 -0400 Subject: MAINT-7343 - moved asset downloads to use coprocedure pools, which should reduce the size of potential memory spikes --- indra/newview/app_settings/settings.xml | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index d2d629339d..f2ae685432 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -14723,6 +14723,15 @@ Value 1 + PoolSizeAssetStorage + + Comment + Coroutine Pool size for AssetStorage requests + Type + U32 + Value + 12 +