diff options
author | Rick Pasetto <rick@lindenlab.com> | 2010-01-08 14:12:15 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-08 14:12:15 -0800 |
commit | 8944bc36ed84fe7ef644e11d1114528520dab670 (patch) | |
tree | fb7df5dd87168542fee4d97e60f91c36a4ca8d7d /indra/newview/app_settings | |
parent | 99ad123b07cd7ce2b05577104602549b6caa41e5 (diff) | |
parent | e57f6a5cee1cf03df2bf43cd7a8b2c42c3918f8b (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.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 7d98a4b6ce..64140cd478 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> |