diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-01-08 16:39:19 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-08 16:39:19 -0800 |
| commit | fa2fdd0a958555d4a74f1c2a8e03cc99eae56c33 (patch) | |
| tree | 44833c9488ba4e86dd8f8ad8a8bc9ecf6cc4fe62 /indra/newview/app_settings/settings.xml | |
| parent | 0f04c65178b96b2fa03a4a727348bc90dc27c2d0 (diff) | |
| parent | 0e97532230afef2cd9f36774776836d2c0aed262 (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 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> |