diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-01-08 15:27:43 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-08 15:27:43 -0800 |
| commit | 0e97532230afef2cd9f36774776836d2c0aed262 (patch) | |
| tree | 9d94c1465cb969970ef2f986f17e050fa2d7ac60 /indra/newview/app_settings | |
| parent | e827c8a5ebed4eef1e8debfd9d61f727be639f04 (diff) | |
| parent | e31d695247f89df1490afb4b9581f562fa99617c (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> |