summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2010-01-18 11:51:13 -0800
committerRick Pasetto <rick@lindenlab.com>2010-01-18 11:51:13 -0800
commit313ef1a0f63683336ec0d740912411bfeb2d9fbd (patch)
tree5fae2247af9995512e0a638c6faaf85078f36258 /indra/newview/app_settings
parent48123c536c8ae182b39440163d7002a07d126e0c (diff)
parentb4ccb9367f810e778e6548ac0a4487f29bfb0341 (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 d0bbcc222d..9f261978e6 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5549,6 +5549,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>