summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorBrad Linden <brad@lindenlab.com>2024-05-23 11:35:23 -0700
committerBrad Linden <brad@lindenlab.com>2024-05-23 11:35:23 -0700
commit9f6849e081deac1f62ab3010ee0984e17749c9e6 (patch)
tree8d916206343d075fc85e90e83ec9dabe8b01376d /indra/newview/app_settings
parenta1f49564d670a2c41bfa25c833bba2564b9b7f48 (diff)
parent03c4458bdcc6821a3047f93b729d412e274ab9af (diff)
Merge remote-tracking branch 'origin/project/gltf_development' into brad/merge-maint-a-to-dev
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index b2cb58d0df..c7999fc2e9 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -15738,5 +15738,16 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>GLTFEnabled</key>
+ <map>
+ <key>Comment</key>
+ <string>Enable GLTF support. Set by SimulatorFeatures</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
</map>
</llsd>