From 52562e2e664c70dcd476291820ac02b893e489b8 Mon Sep 17 00:00:00 2001
From: Karl Steifvater <qarl@lindenlab.com>
Date: Wed, 23 Jul 2008 21:20:19 +0000
Subject: svn merge -r92720:92721
 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge

QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL
---
 indra/newview/app_settings/settings.xml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'indra/newview/app_settings/settings.xml')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 8ca74f6d0f..4c47cb45b2 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5201,6 +5201,28 @@
       <key>Value</key>
       <string />
     </map>
+    <key>PerFrameHoverPick</key>
+    <map>
+      <key>Comment</key>
+      <string>Detect the object under the mouse continually</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <real>1</real>
+    </map>
+    <key>PerFrameHoverPickCount</key>
+    <map>
+      <key>Comment</key>
+      <string>Detect the object under the mouse every n frames</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>PermissionsCautionEnabled</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3