summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-11-06 14:08:27 -0800
committerRick Pasetto <rick@lindenlab.com>2009-11-06 14:08:27 -0800
commit72af8dc3f0a249f69869bc6f52dd7a887702a964 (patch)
tree24c82690af7ce36e166f08bda8c28c0d7824efa8 /indra/newview/app_settings
parentf3bbcfb9d41b41f8c4b144ae9a1173fc7719b88c (diff)
parent4f0731d722c41b6717d08b8165e941a06edd3a1f (diff)
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
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 6f6d5fb979..70c79b4555 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5393,6 +5393,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>PrimMediaDragNDrop</key>
+ <map>
+ <key>Comment</key>
+ <string>Enable drag and drop</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>PrimMediaMaxRetries</key>
<map>
<key>Comment</key>