diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-12-10 09:28:47 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-10 09:28:47 -0800 |
commit | 4a92f49e7b129461010559f3c298620e9a589aab (patch) | |
tree | ab1de981f6c035c666c7d0a383deaddf2bd2afcf /indra/newview/app_settings | |
parent | 9b4d09471cca6922257a27ba9cb70498ab81fd94 (diff) | |
parent | 4c33c54ce03bffd3ad75be3dccaed2d26a68e157 (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 80a3977d02..5b760566f0 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5471,6 +5471,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> |