diff options
author | Rick Pasetto <rick@lindenlab.com> | 2010-01-07 11:45:09 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-07 11:45:09 -0800 |
commit | cbea2b235f688d6d35a2deaa420ab57ffcc78372 (patch) | |
tree | 2ad5e1ec8756fccb5d669c5356b59ecf0ab36d5b /indra/newview/app_settings/settings.xml | |
parent | b7bab35cb58a33014bb05f2d77b03e58d9e90651 (diff) | |
parent | 75c1fb26649df73770459a31641c434e156e2c17 (diff) |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index d83959b80e..a0b02bf3df 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5537,6 +5537,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> |