diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-01-20 09:57:19 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-20 09:57:19 -0800 |
| commit | 927b8da7e9f736e4d142dfc4772d80316f51cc93 (patch) | |
| tree | 553b0a66d8419cc5aa48f76c60d6e3029758c870 /indra/newview/app_settings/settings.xml | |
| parent | 228d37a8d72146d9baed57c7406a9324ce8c0175 (diff) | |
| parent | ae079af48d8ab6b1939168b0a2ac95876da66d24 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-rickcallum
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 9f261978e6..6096504b96 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5552,7 +5552,7 @@ <key>PrimMediaDragNDrop</key> <map> <key>Comment</key> - <string>Enable drag and drop</string> + <string>Enable drag and drop of URLs onto prim faces</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -10786,6 +10786,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>SLURLDragNDrop</key> + <map> + <key>Comment</key> + <string>Enable drag and drop of SLURLs onto the viewer</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>soundsbeacon</key> <map> <key>Comment</key> |