diff options
author | Rick Pasetto <rick@lindenlab.com> | 2010-01-12 14:27:07 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-12 14:27:07 -0800 |
commit | b4ccb9367f810e778e6548ac0a4487f29bfb0341 (patch) | |
tree | 997da678c82e7db765479f210325bf622246f84c /indra/newview/app_settings/settings.xml | |
parent | 3d2506abe721037d9178406ed92a4602a338c71d (diff) | |
parent | 26e63da8cc764a62b24af5d1c5d7eabecc4c0593 (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 382793a497..0d09c4f35e 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5526,6 +5526,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> |