summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authormax nikolenko <maximnproductengine@lindenlab.com>2017-04-27 16:28:48 +0000
committermax nikolenko <maximnproductengine@lindenlab.com>2017-04-27 16:28:48 +0000
commitc995dcdbf301bd3de5d8166fbb76b9835c46bbb3 (patch)
treeb9865370bb765166ffaa6e652aa62b80be64bfca /indra/newview/app_settings
parentf199fd5a521bde770694481c0878300687a6daf2 (diff)
parent69db7cd947a6b272004f7a02a0f45527dba0fdbd (diff)
Merged in MAINT-3223
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 f0a91fd407..89f5d7a24f 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11878,6 +11878,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>SyncMaterialSettings</key>
+ <map>
+ <key>Comment</key>
+ <string>SyncMaterialSettings</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>SnapshotQuality</key>
<map>
<key>Comment</key>