diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2024-06-13 12:51:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-13 12:51:39 -0700 |
| commit | 0ed3483b338376b7a18a05efae6fbc1d4b5db870 (patch) | |
| tree | 72851774ff2b1814a943f64df338ec824bb30643 /indra/newview/app_settings | |
| parent | 162c87a0a852952cf8dca05d37211403612a9933 (diff) | |
| parent | 74765c15731e6b6859b627b898472299ed351e0d (diff) | |
Merge pull request #1743 from secondlife/v-1475
secondlife/viewer#1475: Fix Terrain tab controls no longer disabled when insufficient permissions
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/keywords_lsl_default.xml | 9 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/textureUtilV.glsl | 3 |
3 files changed, 10 insertions, 13 deletions
diff --git a/indra/newview/app_settings/keywords_lsl_default.xml b/indra/newview/app_settings/keywords_lsl_default.xml index 893b017367..f99b86bd39 100644 --- a/indra/newview/app_settings/keywords_lsl_default.xml +++ b/indra/newview/app_settings/keywords_lsl_default.xml @@ -1945,6 +1945,15 @@ <key>tooltip</key> <string/> </map> + <key>INVENTORY_SETTING</key> + <map> + <key>type</key> + <string>integer</string> + <key>value</key> + <integer>56</integer> + <key>tooltip</key> + <string/> + </map> <key>INVENTORY_SOUND</key> <map> <key>type</key> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index ecfef112a4..5f44d24a63 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -9253,17 +9253,6 @@ <key>Value</key> <integer>0</integer> </map> - <key>RenderTerrainPBRForce</key> - <map> - <key>Comment</key> - <string>Force-load PBR terrain if enabled</string> - <key>Persist</key> - <integer>0</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> <key>RenderTerrainPBRDetail</key> <map> <key>Comment</key> diff --git a/indra/newview/app_settings/shaders/class1/deferred/textureUtilV.glsl b/indra/newview/app_settings/shaders/class1/deferred/textureUtilV.glsl index a70180c1b5..767416d564 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/textureUtilV.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/textureUtilV.glsl @@ -135,8 +135,7 @@ vec3 tangent_space_transform(vec4 vertex_tangent, vec3 vertex_normal, vec4[2] kh return (weights.x * vertex_binormal.xyz) + (weights.y * vertex_tangent.xyz); } -// Similar to tangent_space_transform but no offset during coordinate system -// conversion, and no texture animation support. +// Similar to tangent_space_transform but no texture animation support. vec3 terrain_tangent_space_transform(vec4 vertex_tangent, vec3 vertex_normal, vec4[2] khr_gltf_transform) { // Immediately convert to left-handed coordinate system ((0,1) -> (0, -1)) |