diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 18:00:09 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 18:00:09 -0800 |
commit | 66d9161729aef01889e2713bdd0fffca8f6d5466 (patch) | |
tree | 1f6413223be908289dac124ab211dfd689e44676 /indra/newview/app_settings/settings.xml | |
parent | e7eae453908e77a959a2ef6fea272107491fe35e (diff) | |
parent | 23760a63a0f018a48625710f8de07e490f3cdd2f (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 ff569ecffa..c7b0193ab5 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> |