summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-12-18 14:25:15 -0800
committerRick Pasetto <rick@lindenlab.com>2009-12-18 14:25:15 -0800
commit4d55b5bad0cfabc4c9bb4e4d7234efc77b3547e8 (patch)
tree9bfa670a6cd4b40f20d5ae710f028872d592c0ba /indra/newview/app_settings
parent0e729489438898d0de062ea5d744be3009e47c57 (diff)
parent064c9be9aedf238530ccdc941861fd057580e5b1 (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 455c3587ff..d94d8bf341 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5482,6 +5482,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>