From 19fc3fb32c3cd95fcfb5708b59b5620e506c5179 Mon Sep 17 00:00:00 2001
From: Rick Pasetto <rick@lindenlab.com>
Date: Wed, 21 Oct 2009 17:40:36 -0700
Subject: Add setting for PrimMediaDragNDrop, and add implementation that sets
 the current URL and auto play on drop

---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 91d5e04665..9adf893e4b 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5305,6 +5305,17 @@
       <key>Value</key>
 	  <integer>13</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>
-- 
cgit v1.2.3


From ae079af48d8ab6b1939168b0a2ac95876da66d24 Mon Sep 17 00:00:00 2001
From: Rick Pasetto <rick@lindenlab.com>
Date: Wed, 20 Jan 2010 09:55:36 -0800
Subject: Add another setting controlling whether SLURL drag-and-drop performs
 a teleport

---
 indra/newview/app_settings/settings.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'indra/newview/app_settings')

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>
-- 
cgit v1.2.3