From 80a8bab2a9dd8e77262b001af973212a6cba4a5a Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 12 Sep 2008 14:59:33 -0500
Subject: Second Life viewer sources 1.21.2-RC

---
 linden/indra/newview/app_settings/keywords.ini |  4 ++++
 linden/indra/newview/app_settings/settings.xml | 15 ++-------------
 2 files changed, 6 insertions(+), 13 deletions(-)

(limited to 'linden/indra/newview/app_settings')

diff --git a/linden/indra/newview/app_settings/keywords.ini b/linden/indra/newview/app_settings/keywords.ini
index 23c88dc..3679c38 100644
--- a/linden/indra/newview/app_settings/keywords.ini
+++ b/linden/indra/newview/app_settings/keywords.ini
@@ -506,6 +506,10 @@ CLICK_ACTION_OPEN       Used with llSetClickAction to set open as the default ac
 CLICK_ACTION_PLAY       Used with llSetClickAction to set play as the default action when object is clicked
 CLICK_ACTION_OPEN_MEDIA Used with llSetClickAction to set open-media as the default action when object is clicked
 
+TOUCH_INVALID_TEXCOORD  Value returned by llDetectedTouchUV() and llDetectedTouchST() when the touch position is not valid.
+TOUCH_INVALID_VECTOR    Value returned by llDetectedTouchPos(), llDetectedTouchNormal(), and llDetectedTouchBinormal() when the touch position is not valid.
+TOUCH_INVALID_FACE      Value returned by llDetectedTouchFace() when the touch position is not valid.
+
 # string constants
 [word .1, .3, .5]
 NULL_KEY			Indicates an empty key
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index f2653cd..5543847 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -2360,17 +2360,6 @@
         <real>1.0</real>
       </array>
     </map>
-    <key>EnablePushToTalk</key>
-    <map>
-      <key>Comment</key>
-      <string>Must hold down a key or moouse button when talking into your microphone</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
     <key>EnableRippleWater</key>
     <map>
       <key>Comment</key>
@@ -5165,7 +5154,7 @@
     <key>PTTCurrentlyEnabled</key>
     <map>
       <key>Comment</key>
-      <string />
+      <string>Use Push to Talk mode</string>
       <key>Persist</key>
       <integer>0</integer>
       <key>Type</key>
@@ -10050,7 +10039,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>WaterEditPresets</key>
     <map>
-- 
cgit v1.1