From a93e6c12fbf8a0b05bd2db820a41aa2e1182c143 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Wed, 13 Sep 2023 20:19:04 +0300 Subject: autorun selected script after login --- 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 816b7b7c92..cc9740d934 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -17063,6 +17063,17 @@ Value 3 + AutorunLuaScriptName + + Comment + Script name to autorun after login. + Persist + 1 + Type + String + Value + default.lua + ResetUIScaleOnFirstRun Comment -- cgit v1.2.3 From 177000d2c9b3dba889119d63109f9b6d8748b0b7 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 9 Feb 2024 17:19:48 -0500 Subject: Add command-line switches --lua "chunk" and --luafile pathname. --lua "chunk" runs the specified Lua chunk at startup time. --luafile pathname runs the specified Lua script file at startup time. You may specify more than one --lua or --luafile switch on the command line. --- indra/newview/app_settings/cmd_line.xml | 28 +++++++++++++++++++++++++++- indra/newview/app_settings/settings.xml | 24 +++++++++++++++++++++++- 2 files changed, 50 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/cmd_line.xml b/indra/newview/app_settings/cmd_line.xml index 340334aee8..534d1d594d 100644 --- a/indra/newview/app_settings/cmd_line.xml +++ b/indra/newview/app_settings/cmd_line.xml @@ -195,7 +195,33 @@ LogPerformance - multiple + lua + + desc + Run specified Lua chunk + count + 1 + + compose + true + map-to + LuaChunk + + + luafile + + desc + Run specified Lua script + count + 1 + + compose + true + map-to + LuaScript + + + multiple desc Allow multiple viewers. diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 5e4cd4e57b..bda07f8821 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -68,7 +68,7 @@ Value 1 - CrashHostUrl + CrashHostUrl Comment A URL pointing to a crash report handler; overrides cluster negotiation to locate crash handler. @@ -5431,6 +5431,28 @@ Value http://wiki.secondlife.com/wiki/[LSL_STRING] + LuaChunk + + Comment + Zero or more Lua chunks to run + Persist + 0 + Type + LLSD + Value + + + LuaScript + + Comment + Zero or more Lua script files to run + Persist + 0 + Type + LLSD + Value + + GridStatusRSS Comment -- cgit v1.2.3 From 72730609f371ae0417a2d117fdc9d805ce8858fb Mon Sep 17 00:00:00 2001 From: Brad Linden <46733234+brad-linden@users.noreply.github.com> Date: Wed, 10 Apr 2024 09:48:03 -0700 Subject: Fix linux some shader errors when running under WSL, related to secondlife/viewer#1149 (#1170) --- .../app_settings/shaders/class1/deferred/screenSpaceReflUtil.glsl | 4 ++-- indra/newview/app_settings/shaders/class3/deferred/materialF.glsl | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/shaders/class1/deferred/screenSpaceReflUtil.glsl b/indra/newview/app_settings/shaders/class1/deferred/screenSpaceReflUtil.glsl index 1a85d70256..a33c4cc58b 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/screenSpaceReflUtil.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/screenSpaceReflUtil.glsl @@ -27,11 +27,11 @@ float random (vec2 uv) { - return 0; + return 0.; } float tapScreenSpaceReflection(int totalSamples, vec2 tc, vec3 viewPos, vec3 n, inout vec4 collectedColor, sampler2D source, float glossiness) { collectedColor = vec4(0); - return 0; + return 0.; } diff --git a/indra/newview/app_settings/shaders/class3/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class3/deferred/materialF.glsl index ec1e49eeb4..83c3845d18 100644 --- a/indra/newview/app_settings/shaders/class3/deferred/materialF.glsl +++ b/indra/newview/app_settings/shaders/class3/deferred/materialF.glsl @@ -53,7 +53,7 @@ out vec4 frag_color; float sampleDirectionalShadow(vec3 pos, vec3 norm, vec2 pos_screen); #endif -void sampleReflectionProbesLegacy(inout vec3 ambenv, inout vec3 glossenv, inout vec3 legacyenv, +void sampleReflectionProbesLegacy(out vec3 ambenv, out vec3 glossenv, out vec3 legacyenv, vec2 tc, vec3 pos, vec3 norm, float glossiness, float envIntensity, bool transparent, vec3 amblit_linear); void applyGlossEnv(inout vec3 color, vec3 glossenv, vec4 spec, vec3 pos, vec3 norm); void applyLegacyEnv(inout vec3 color, vec3 legacyenv, vec4 spec, vec3 pos, vec3 norm, float envIntensity); @@ -276,10 +276,10 @@ float getShadow(vec3 pos, vec3 norm) #if (DIFFUSE_ALPHA_MODE == DIFFUSE_ALPHA_MODE_BLEND) return sampleDirectionalShadow(pos, norm, vary_texcoord0.xy); #else - return 1; + return 1.; #endif #else - return 1; + return 1.; #endif } -- cgit v1.2.3 From 295cff0fb5370f75749adf41a6c2d26c3431414c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 15 Apr 2024 11:05:56 +0200 Subject: Fix broken shaders due to 72730609f371ae0417a2d117fdc9d805ce8858fb --- indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl | 2 +- .../newview/app_settings/shaders/class2/deferred/reflectionProbeF.glsl | 2 +- .../newview/app_settings/shaders/class3/deferred/fullbrightShinyF.glsl | 2 +- .../newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl | 2 +- indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl index acd32a81b3..0f9bd131fd 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl @@ -78,7 +78,7 @@ float sampleDirectionalShadow(vec3 pos, vec3 norm, vec2 pos_screen); float getAmbientClamp(); -void sampleReflectionProbesLegacy(inout vec3 ambenv, inout vec3 glossenv, inout vec3 legacyenv, +void sampleReflectionProbesLegacy(out vec3 ambenv, out vec3 glossenv, out vec3 legacyenv, vec2 tc, vec3 pos, vec3 norm, float glossiness, float envIntensity, bool transparent, vec3 amblit_linear); vec3 calcPointLightOrSpotLight(vec3 light_col, vec3 diffuse, vec3 v, vec3 n, vec4 lp, vec3 ln, float la, float fa, float is_pointlight, float ambiance) diff --git a/indra/newview/app_settings/shaders/class2/deferred/reflectionProbeF.glsl b/indra/newview/app_settings/shaders/class2/deferred/reflectionProbeF.glsl index 52e71edcac..35848ff4cd 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/reflectionProbeF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/reflectionProbeF.glsl @@ -55,7 +55,7 @@ vec4 sampleReflectionProbesDebug(vec3 pos) return vec4(0, 0, 0, 0); } -void sampleReflectionProbesLegacy(inout vec3 ambenv, inout vec3 glossenv, inout vec3 legacyenv, +void sampleReflectionProbesLegacy(out vec3 ambenv, out vec3 glossenv, out vec3 legacyenv, vec2 tc, vec3 pos, vec3 norm, float glossiness, float envIntensity, bool transparent, vec3 amblit_linear) { ambenv = vec3(reflection_probe_ambiance * 0.25); diff --git a/indra/newview/app_settings/shaders/class3/deferred/fullbrightShinyF.glsl b/indra/newview/app_settings/shaders/class3/deferred/fullbrightShinyF.glsl index 8430cca325..ab43262c0e 100644 --- a/indra/newview/app_settings/shaders/class3/deferred/fullbrightShinyF.glsl +++ b/indra/newview/app_settings/shaders/class3/deferred/fullbrightShinyF.glsl @@ -48,7 +48,7 @@ vec3 linear_to_srgb(vec3 c); vec3 srgb_to_linear(vec3 c); // reflection probe interface -void sampleReflectionProbesLegacy(inout vec3 ambenv, inout vec3 glossenv, inout vec3 legacyenv, +void sampleReflectionProbesLegacy(out vec3 ambenv, out vec3 glossenv, out vec3 legacyenv, vec2 tc, vec3 pos, vec3 norm, float glossiness, float envIntensity, bool transparent, vec3 amblit_linear); void applyLegacyEnv(inout vec3 color, vec3 legacyenv, vec4 spec, vec3 pos, vec3 norm, float envIntensity); diff --git a/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl b/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl index 906e66ecc8..d19ec89cbc 100644 --- a/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl +++ b/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl @@ -785,7 +785,7 @@ vec4 sampleReflectionProbesDebug(vec3 pos) return col; } -void sampleReflectionProbesLegacy(inout vec3 ambenv, inout vec3 glossenv, inout vec3 legacyenv, +void sampleReflectionProbesLegacy(out vec3 ambenv, out vec3 glossenv, out vec3 legacyenv, vec2 tc, vec3 pos, vec3 norm, float glossiness, float envIntensity, bool transparent, vec3 amblit) { float reflection_lods = max_probe_lod; diff --git a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl index 5e8fe9301a..f4a1df9c2c 100644 --- a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl @@ -70,7 +70,7 @@ vec3 scaleSoftClipFragLinear(vec3 l); // reflection probe interface void sampleReflectionProbes(inout vec3 ambenv, inout vec3 glossenv, vec2 tc, vec3 pos, vec3 norm, float glossiness, bool transparent, vec3 amblit_linear); -void sampleReflectionProbesLegacy(inout vec3 ambenv, inout vec3 glossenv, inout vec3 legacyenv, +void sampleReflectionProbesLegacy(out vec3 ambenv, out vec3 glossenv, out vec3 legacyenv, vec2 tc, vec3 pos, vec3 norm, float glossiness, float envIntensity, bool transparent, vec3 amblit_linear); void applyGlossEnv(inout vec3 color, vec3 glossenv, vec4 spec, vec3 pos, vec3 norm); void applyLegacyEnv(inout vec3 color, vec3 legacyenv, vec4 spec, vec3 pos, vec3 norm, float envIntensity); -- cgit v1.2.3 From 477b45be1be256b7496e1d45b41754c6e40ef58a Mon Sep 17 00:00:00 2001 From: Maki Date: Fri, 19 Apr 2024 02:32:29 -0400 Subject: Add toggle for PipeWire volume catcher, and refactoring --- 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 2f7c256b49..705319ee40 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -6522,6 +6522,17 @@ Value 0 + MediaPluginPipeWireVolumeCatcher + + Comment + Use PipeWire instead of PulseAudio for controlling web media volume. + Persist + 1 + Type + Boolean + Value + 0 + MediaControlFadeTime Comment -- cgit v1.2.3 From a65bc46b138b89200586b29fe729cbc7b0f0c8c4 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 17 Jun 2024 17:25:45 +0200 Subject: Fix shaders broken in merge --- indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl | 2 -- .../app_settings/shaders/class3/deferred/reflectionProbeF.glsl | 2 +- .../newview/app_settings/shaders/class3/deferred/softenLightF.glsl | 6 +++--- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl index 94d5664815..e9f849a8c0 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl @@ -79,8 +79,6 @@ float getAmbientClamp(); void mirrorClip(vec3 pos); -void mirrorClip(vec3 pos); - void sampleReflectionProbesLegacy(out vec3 ambenv, out vec3 glossenv, out vec3 legacyenv, vec2 tc, vec3 pos, vec3 norm, float glossiness, float envIntensity, bool transparent, vec3 amblit_linear); diff --git a/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl b/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl index ae3188cebd..47ec8fba55 100644 --- a/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl +++ b/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl @@ -452,7 +452,7 @@ void boxIntersectionDebug( in vec3 ro, in vec3 p, vec3 boxSize, inout vec4 col) void boxIntersectDebug(vec3 origin, vec3 pos, mat4 i, inout vec4 col) { - mat4 clipToLocal = refBox[i]; + mat4 clipToLocal = i; // transform into unit cube space origin = (clipToLocal * vec4(origin, 1.0)).xyz; diff --git a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl index 8db04f2c18..494a69efd0 100644 --- a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl @@ -169,7 +169,7 @@ void main() if (GET_GBUFFER_FLAG(GBUFFER_FLAG_HAS_PBR)) { - vec3 orm = texture(specularRect, tc).rgb; + vec3 orm = spec.rgb; float perceptualRoughness = orm.g; float metallic = orm.b; float ao = orm.r; @@ -179,7 +179,7 @@ void main() float gloss = 1.0 - perceptualRoughness; sampleReflectionProbes(irradiance, radiance, tc, pos.xyz, norm.xyz, gloss, false, amblit_linear); - + adjustIrradiance(irradiance, ambocc); vec3 diffuseColor; @@ -215,7 +215,7 @@ void main() vec3 legacyenv = vec3(0); sampleReflectionProbesLegacy(irradiance, glossenv, legacyenv, tc, pos.xyz, norm.xyz, spec.a, envIntensity, false, amblit_linear); - + adjustIrradiance(irradiance, ambocc); // apply lambertian IBL only (see pbrIbl) -- cgit v1.2.3 From ac56718929044e101dc2c7bfe3ebc5dff565b76d Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 28 Jun 2024 13:21:14 -0400 Subject: Add LuaAutorunPath, LuaCommandPath and LuaRequirePath settings. Remove AutorunLuaScriptFile and the LLLUAmanager::runScriptOnLogin() method that checked it. Instead, iterate over LuaAutorunPath directories at viewer startup, iterate over *.lua files in each and implicitly run those. LuaCommandPath and LuaRequirePath are not yet implemented. --- indra/newview/app_settings/settings.xml | 634 +++++++++++++++++--------------- 1 file changed, 331 insertions(+), 303 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 2463d56eae..cdaf9a47dd 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -346,7 +346,7 @@ Value 0.5 - AudioStreamingMedia + AudioStreamingMedia Comment Enable streaming @@ -1291,7 +1291,7 @@ Type Boolean Value - 0 + 0 CameraPositionSmoothing @@ -1907,17 +1907,17 @@ Value - DebugAvatarRezTime - - Comment - Display times for avatars to resolve. - Persist - 1 - Type - Boolean - Value - 0 - + DebugAvatarRezTime + + Comment + Display times for avatars to resolve. + Persist + 1 + Type + Boolean + Value + 0 + DebugAvatarLocalTexLoadedTime Comment @@ -2292,39 +2292,39 @@ Value 0 - DefaultFemaleAvatar - - Comment - Default Female Avatar - Persist - 1 - Type - String - Value - Female Shape & Outfit - - DefaultLoginLocation - - Comment - Startup destination default (if not specified on command line) - Persist - 0 - Type - String - Value - - - DefaultMaleAvatar - - Comment - Default Male Avatar - Persist - 1 - Type - String - Value - Male Shape & Outfit - + DefaultFemaleAvatar + + Comment + Default Female Avatar + Persist + 1 + Type + String + Value + Female Shape & Outfit + + DefaultLoginLocation + + Comment + Startup destination default (if not specified on command line) + Persist + 0 + Type + String + Value + + + DefaultMaleAvatar + + Comment + Default Male Avatar + Persist + 1 + Type + String + Value + Male Shape & Outfit + DestinationGuideURL Comment @@ -2699,7 +2699,7 @@ Value 0 - FirstSelectedEnabledPopups + FirstSelectedEnabledPopups Comment Return false if there is not enable popup selected in the list of floater preferences popups @@ -3521,39 +3521,39 @@ Value 0 - InventoryLinking - - Comment - Enable ability to create links to folders and items via "Paste as link". - Persist - 1 - Type - Boolean - Value - 1 - - InventoryOutboxLogging - - Comment - Enable debug output associated with the Merchant Outbox. - Persist - 1 - Type - Boolean - Value - 0 - - InventoryOutboxMakeVisible - - Comment - Enable making the Merchant Outbox and Inbox visible in the inventory for debug purposes. - Persist - 1 - Type - Boolean - Value - 0 - + InventoryLinking + + Comment + Enable ability to create links to folders and items via "Paste as link". + Persist + 1 + Type + Boolean + Value + 1 + + InventoryOutboxLogging + + Comment + Enable debug output associated with the Merchant Outbox. + Persist + 1 + Type + Boolean + Value + 0 + + InventoryOutboxMakeVisible + + Comment + Enable making the Merchant Outbox and Inbox visible in the inventory for debug purposes. + Persist + 1 + Type + Boolean + Value + 0 + InventoryOutboxMaxFolderCount Comment @@ -3807,8 +3807,8 @@ Value 0.25 - Jpeg2000AdvancedCompression - + Jpeg2000AdvancedCompression + Comment Use advanced Jpeg2000 compression options (precincts, blocks, ordering, markers) Persist @@ -3817,9 +3817,9 @@ Boolean Value 0 - - Jpeg2000PrecinctsSize - + + Jpeg2000PrecinctsSize + Comment Size of image precincts. Assumed square and same for all levels. Must be power of 2. Persist @@ -3828,9 +3828,9 @@ S32 Value 256 - - Jpeg2000BlocksSize - + + Jpeg2000BlocksSize + Comment Size of encoding blocks. Assumed square and same for all levels. Must be power of 2. Max 64, Min 4. Persist @@ -3839,7 +3839,7 @@ S32 Value 64 - + KeepAspectForSnapshot Comment @@ -3917,10 +3917,23 @@ Value Monospace + LuaAutorunPath + + Comment + Directories containing scripts to autorun at viewer startup + Persist + 1 + Type + LLSD + Value + + scripts/lua/auto + + LuaChunk Comment - Zero or more Lua chunks to run + Zero or more Lua chunks to run from command line Persist 0 Type @@ -3928,10 +3941,36 @@ Value + LuaCommandPath + + Comment + Directories containing scripts recognized as chat slash commands + Persist + 1 + Type + LLSD + Value + + scripts/lua + + + LuaRequirePath + + Comment + Directories containing Lua modules loadable by require() + Persist + 1 + Type + LLSD + Value + + scripts/lua/require + + LuaScript Comment - Zero or more Lua script files to run + Zero or more Lua script files to run from command line Persist 0 Type @@ -4469,17 +4508,17 @@ Value - MarketplaceListingsLogging - - Comment - Enable debug output associated with the Marketplace Listings (SLM) API. - Persist - 1 - Type - Boolean - Value - 0 - + MarketplaceListingsLogging + + Comment + Enable debug output associated with the Marketplace Listings (SLM) API. + Persist + 1 + Type + Boolean + Value + 0 + MarketplaceURL Comment @@ -5365,28 +5404,28 @@ Value 1000 - FakeInitialOutfitName - - Comment - Pretend that this is first time login and specified name was chosen - Persist - 1 - Type + FakeInitialOutfitName + + Comment + Pretend that this is first time login and specified name was chosen + Persist + 1 + Type String Value - - MyOutfitsAutofill - - Comment - Always autofill My Outfits from library when empty (else happens just once). - Persist - 1 - Type - Boolean - Value - 0 - + + MyOutfitsAutofill + + Comment + Always autofill My Outfits from library when empty (else happens just once). + Persist + 1 + Type + Boolean + Value + 0 + NearMeRange Comment @@ -5506,7 +5545,7 @@ Type Boolean Value - 0 + 0 NonvisibleObjectsInMemoryTime @@ -5517,7 +5556,7 @@ Type U32 Value - 64 + 64 NoPreload @@ -6429,7 +6468,7 @@ Value 6.0 - PreferredMaturity + PreferredMaturity Comment Setting for the user's preferred maturity level (consts in indra_constants.h) @@ -6438,7 +6477,7 @@ Type U32 Value - 13 + 13 PreviewAmbientColor @@ -6608,8 +6647,8 @@ PrimMediaMasterEnabled - - Comment + + Comment Whether or not Media on a Prim is enabled. Persist 1 @@ -6618,9 +6657,9 @@ Value 1 - PrimMediaControlsUseHoverControlSet - - Comment + PrimMediaControlsUseHoverControlSet + + Comment Whether or not hovering over prim media uses minimal "hover" controls or the authored control set. Persist 1 @@ -6629,17 +6668,17 @@ Value 0 - PrimMediaDragNDrop - - Comment - Enable drag and drop of URLs onto prim faces - Persist - 1 - Type - Boolean - Value - 1 - + PrimMediaDragNDrop + + Comment + Enable drag and drop of URLs onto prim faces + Persist + 1 + Type + Boolean + Value + 1 + PrimMediaMaxRetries Comment @@ -6673,7 +6712,7 @@ Value 5.0 - PrimMediaMaxSortedQueueSize + PrimMediaMaxSortedQueueSize Comment Maximum number of objects the viewer will load media for initially @@ -6684,7 +6723,7 @@ Value 100000 - PrimMediaMaxRoundRobinQueueSize + PrimMediaMaxRoundRobinQueueSize Comment Maximum number of objects the viewer will continuously update media for @@ -8788,17 +8827,17 @@ Value 1024 - RenderHeroProbeDistance - - Comment - Distance in meters for hero probes to render out to. - Persist - 1 - Type - F32 - Value - 8 - + RenderHeroProbeDistance + + Comment + Distance in meters for hero probes to render out to. + Persist + 1 + Type + F32 + Value + 8 + RenderHeroProbeUpdateRate Comment @@ -9363,17 +9402,17 @@ Value 1 - RenderTransparentWater - - Comment - Render water as transparent. Setting to false renders water as opaque with a simple texture applied. + RenderTransparentWater + + Comment + Render water as transparent. Setting to false renders water as opaque with a simple texture applied. Persist 1 Type Boolean Value 1 - + RenderTreeLODFactor Comment @@ -9655,18 +9694,18 @@ Value 1 - RenderPreferStreamDraw - - Comment - Use GL_STREAM_DRAW in place of GL_DYNAMIC_DRAW - Persist - 1 - Type - Boolean - Value - 0 - - RenderVolumeLODFactor + RenderPreferStreamDraw + + Comment + Use GL_STREAM_DRAW in place of GL_DYNAMIC_DRAW + Persist + 1 + Type + Boolean + Value + 0 + + RenderVolumeLODFactor Comment Controls level of detail of primitives (multiplier for current screen area when calculated level of detail) @@ -9765,18 +9804,18 @@ Value 0 - ReportBugURL - - Comment - URL used for filing bugs from viewer - Persist - 1 - Type - String - Value - https://feedback.secondlife.com/ - - RevokePermsOnStopAnimation + ReportBugURL + + Comment + URL used for filing bugs from viewer + Persist + 1 + Type + String + Value + https://feedback.secondlife.com/ + + RevokePermsOnStopAnimation Comment Clear animation permssions when choosing "Stop Animating Me" @@ -10029,39 +10068,39 @@ Value 400.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 - - 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 - + 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 @@ -10238,7 +10277,7 @@ Value 0 - AvatarNameTagMode + AvatarNameTagMode Comment Select Avatar Name Tag Mode @@ -10447,7 +10486,7 @@ Value 1 - ShowScriptErrors + ShowScriptErrors Comment Show script errors @@ -10458,7 +10497,7 @@ Value 1 - ShowScriptErrorsLocation + ShowScriptErrorsLocation Comment Show script error in chat (0) or window (1). @@ -10717,8 +10756,8 @@ Display results of find events that are flagged as moderate Persist 1 - HideFromEditor - 1 + HideFromEditor + 1 Type Boolean Value @@ -10730,8 +10769,8 @@ Display results of find events that are flagged as adult Persist 1 - HideFromEditor - 1 + HideFromEditor + 1 Type Boolean Value @@ -10743,8 +10782,8 @@ Display results of find land sales that are flagged as general Persist 1 - HideFromEditor - 1 + HideFromEditor + 1 Type Boolean Value @@ -10756,8 +10795,8 @@ Display results of find land sales that are flagged as moderate Persist 1 - HideFromEditor - 1 + HideFromEditor + 1 Type Boolean Value @@ -10769,8 +10808,8 @@ Display results of find land sales that are flagged as adult Persist 1 - HideFromEditor - 1 + HideFromEditor + 1 Type Boolean Value @@ -10782,8 +10821,8 @@ Display results of find places or find popular that are in general sims Persist 1 - HideFromEditor - 1 + HideFromEditor + 1 Type Boolean Value @@ -10795,8 +10834,8 @@ Display results of find places or find popular that are in moderate sims Persist 1 - HideFromEditor - 1 + HideFromEditor + 1 Type Boolean Value @@ -10808,8 +10847,8 @@ Display results of find places or find popular that are in adult sims Persist 1 - HideFromEditor - 1 + HideFromEditor + 1 Type Boolean Value @@ -10947,17 +10986,17 @@ Value 0 - ShowTutorial - - Comment - Show tutorial window on login - Persist - 1 - Type - Boolean - Value - 0 - + ShowTutorial + + Comment + Show tutorial window on login + Persist + 1 + Type + Boolean + Value + 0 + ShowVoiceVisualizersInCalls Comment @@ -13529,17 +13568,17 @@ Value 0.40000000596 - moapbeacon - - Comment - Beacon / Highlight media on a prim sources - Persist - 1 - Type - Boolean - Value - 0 - + moapbeacon + + Comment + Beacon / Highlight media on a prim sources + Persist + 1 + Type + Boolean + Value + 0 + particlesbeacon Comment @@ -13639,17 +13678,17 @@ Value 0 - SLURLDragNDrop - - Comment - Enable drag and drop of SLURLs onto the viewer - Persist - 1 - Type - Boolean - Value - 1 - + SLURLDragNDrop + + Comment + Enable drag and drop of SLURLs onto the viewer + Persist + 1 + Type + Boolean + Value + 1 + SLURLPassToOtherInstance Comment @@ -13837,10 +13876,10 @@ LLSD Value - snapshot - postcard - mini_map - beacons + snapshot + postcard + mini_map + beacons LandmarksSortedByDate @@ -14590,7 +14629,7 @@ Value 0 - LocalTerrainAsset1 + LocalTerrainAsset1 Comment If set to a non-null UUID, overrides the terrain asset locally for all regions with material assets. Local terrain assets are not visible to others. Please keep in mind that this debug setting may be temporary. Do not rely on this setting existing in future viewer builds. @@ -14601,7 +14640,7 @@ Value 00000000-0000-0000-0000-000000000000 - LocalTerrainAsset2 + LocalTerrainAsset2 Comment If set to a non-null UUID, overrides the terrain asset locally for all regions with material assets. Local terrain assets are not visible to others. Please keep in mind that this debug setting may be temporary. Do not rely on this setting existing in future viewer builds. @@ -14612,7 +14651,7 @@ Value 00000000-0000-0000-0000-000000000000 - LocalTerrainAsset3 + LocalTerrainAsset3 Comment If set to a non-null UUID, overrides the terrain asset locally for all regions with material assets. Local terrain assets are not visible to others. Please keep in mind that this debug setting may be temporary. Do not rely on this setting existing in future viewer builds. @@ -14623,7 +14662,7 @@ Value 00000000-0000-0000-0000-000000000000 - LocalTerrainAsset4 + LocalTerrainAsset4 Comment If set to a non-null UUID, overrides the terrain asset locally for all regions with material assets. Local terrain assets are not visible to others. Please keep in mind that this debug setting may be temporary. Do not rely on this setting existing in future viewer builds. @@ -14634,7 +14673,7 @@ Value 00000000-0000-0000-0000-000000000000 - PathfindingRetrieveNeighboringRegion + PathfindingRetrieveNeighboringRegion Comment Download a neighboring region when visualizing a pathfinding navmesh (default val 99 means do not download neighbors). @@ -14643,9 +14682,9 @@ Type U32 Value - 99 + 99 - PathfindingNavMeshClear + PathfindingNavMeshClear Comment Background color when displaying pathfinding navmesh. @@ -14805,7 +14844,7 @@ 1.0 - PathfindingTestPathValidEndColor + PathfindingTestPathValidEndColor Comment Color of the pathfinding test-pathing tool end-point when the path is valid. @@ -14837,7 +14876,7 @@ 1.0 - PathfindingTestPathColor + PathfindingTestPathColor Comment Color of the pathfinding test-path when the path is valid. @@ -15397,17 +15436,6 @@ Value 3 - AutorunLuaScriptName - - Comment - Script name to autorun after login. - Persist - 1 - Type - String - Value - default.lua - ResetUIScaleOnFirstRun Comment @@ -15485,17 +15513,17 @@ Value 300 - StatsReportFileInterval - - Comment - Interval to save viewer stats file data - Persist - 1 - Type - F32 - Value - 0.2 - + StatsReportFileInterval + + Comment + Interval to save viewer stats file data + Persist + 1 + Type + F32 + Value + 0.2 + StatsReportSkipZeroDataSaves Comment -- cgit v1.2.3 From 1745701280d8a18f51ef09aacba4f76a4c543681 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Thu, 18 Jul 2024 08:01:24 +0300 Subject: Remove trailing whitespaces to make pre-commit happy --- .../app_settings/shaders/class2/deferred/reflectionProbeF.glsl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/shaders/class2/deferred/reflectionProbeF.glsl b/indra/newview/app_settings/shaders/class2/deferred/reflectionProbeF.glsl index 35848ff4cd..4fb24ca0b1 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/reflectionProbeF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/reflectionProbeF.glsl @@ -37,7 +37,7 @@ void sampleReflectionProbes(inout vec3 ambenv, inout vec3 glossenv, vec2 tc, vec3 pos, vec3 norm, float glossiness, bool transparent, vec3 amblit_linear) { ambenv = vec3(reflection_probe_ambiance * 0.25); - + vec3 refnormpersp = normalize(reflect(pos.xyz, norm.xyz)); vec3 env_vec = env_mat * refnormpersp; glossenv = srgb_to_linear(texture(environmentMap, env_vec).rgb); @@ -59,7 +59,7 @@ void sampleReflectionProbesLegacy(out vec3 ambenv, out vec3 glossenv, out vec3 l vec2 tc, vec3 pos, vec3 norm, float glossiness, float envIntensity, bool transparent, vec3 amblit_linear) { ambenv = vec3(reflection_probe_ambiance * 0.25); - + vec3 refnormpersp = normalize(reflect(pos.xyz, norm.xyz)); vec3 env_vec = env_mat * refnormpersp; @@ -70,7 +70,7 @@ void sampleReflectionProbesLegacy(out vec3 ambenv, out vec3 glossenv, out vec3 l void applyGlossEnv(inout vec3 color, vec3 glossenv, vec4 spec, vec3 pos, vec3 norm) { - + } void applyLegacyEnv(inout vec3 color, vec3 legacyenv, vec4 spec, vec3 pos, vec3 norm, float envIntensity) -- cgit v1.2.3 From 782a898efadadf2747cc3310749f34a8dde8dd60 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 6 Sep 2024 15:11:15 -0400 Subject: Introduce LuaFeature debug setting, default off. Make central Lua engine functionality conditional on that flag. --- 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 248992fd07..c6946d1ec1 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3999,6 +3999,17 @@ scripts/lua + LuaFeature + + Comment + Enable viewer's Lua script engine. + Persist + 1 + Type + Boolean + Value + 0 + LuaRequirePath Comment -- cgit v1.2.3