diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-01-05 13:55:09 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-05 13:55:09 -0800 |
| commit | 7a6494df680be129eb14fb45e996804a190e86fa (patch) | |
| tree | 99a6f245722e8f0563c5459fa5b84566609f5cf5 /indra/newview/app_settings/settings.xml | |
| parent | e90fbe5b270d8083e9a8e12dacf3e016131938cf (diff) | |
| parent | 9204681c31184c4c76c8f41c48da76e174e3276a (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 359f4abe56..3a6a066ce5 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5515,6 +5515,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> |