summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings_per_account.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2017-03-06 14:31:51 -0500
committerOz Linden <oz@lindenlab.com>2017-03-06 14:31:51 -0500
commit61bddc22d97150cd590bc4184355133b6dd3ff87 (patch)
tree59b488c8c4edc51096338fab153d9eaf837d27fe /indra/newview/app_settings/settings_per_account.xml
parenta18d4df6c742aa397b70e4dafb41475bd201a558 (diff)
parent08ed7f676f2ce38937a03c2a4e823e3564981264 (diff)
merge changes for 5.0.2-release
Diffstat (limited to 'indra/newview/app_settings/settings_per_account.xml')
-rw-r--r--indra/newview/app_settings/settings_per_account.xml44
1 files changed, 44 insertions, 0 deletions
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 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>ModelUploadFolder</key>
+ <map>
+ <key>Comment</key>
+ <string>All model uploads will be stored in this directory (UUID)</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
+ <string></string>
+ </map>
+ <key>TextureUploadFolder</key>
+ <map>
+ <key>Comment</key>
+ <string>All image(texture) uploads will be stored in this directory (UUID)</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
+ <string></string>
+ </map>
+ <key>SoundUploadFolder</key>
+ <map>
+ <key>Comment</key>
+ <string>All sound uploads will be stored in this directory (UUID)</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
+ <string></string>
+ </map>
+ <key>AnimationUploadFolder</key>
+ <map>
+ <key>Comment</key>
+ <string>All animation uploads will be stored in this directory (UUID)</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
+ <string></string>
+ </map>
</map>
</llsd>