summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2010-01-20 09:55:36 -0800
committerRick Pasetto <rick@lindenlab.com>2010-01-20 09:55:36 -0800
commitae079af48d8ab6b1939168b0a2ac95876da66d24 (patch)
tree4ecbaf5189236e11299fe02ab9689bd5600ff947 /indra/newview/app_settings
parent313ef1a0f63683336ec0d740912411bfeb2d9fbd (diff)
Add another setting controlling whether SLURL drag-and-drop performs a teleport
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml13
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>