diff options
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/keywords.ini | 4 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 68 |
2 files changed, 27 insertions, 45 deletions
diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini index 23c88dc449..3679c3882c 100644 --- a/indra/newview/app_settings/keywords.ini +++ b/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/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 8526c5afcd..1f34bae9b5 100644 --- a/indra/newview/app_settings/settings.xml +++ b/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> @@ -5206,28 +5195,6 @@ <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> @@ -5277,6 +5244,28 @@ <key>Value</key> <real>0.34999999404</real> </map> + <key>PicksPerSecondMouseMoving</key> + <map> + <key>Comment</key> + <string>How often to perform hover picks while the mouse is moving (picks per second)</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>5.0</real> + </map> + <key>PicksPerSecondMouseStationary</key> + <map> + <key>Comment</key> + <string>How often to perform hover picks while the mouse is stationary (picks per second)</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>0.0</real> + </map> <key>PieMenuLineWidth</key> <map> <key>Comment</key> @@ -6885,17 +6874,6 @@ <key>Value</key> <integer>0</integer> </map> - <key>ShowDepthBuffer</key> - <map> - <key>Comment</key> - <string>Show depth buffer contents</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> <key>ShowDirectory</key> <map> <key>Comment</key> |