diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-12-03 11:55:43 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-03 11:55:43 -0800 |
commit | 0a2a52c3b1f60668110381ef782cfa6d1088fa4e (patch) | |
tree | 1cecce5cb15dfa74cc83bbdf8ca9779335458ce6 /indra/newview/app_settings | |
parent | 18901432e93ab887726b58354ae45ddb43e8ed27 (diff) | |
parent | 57195ccd74d5873f4b861afe4bf56ccee78a87a2 (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 6252bd002e..8212ad5000 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5450,6 +5450,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> |