diff options
author | palange <palange@lindenlab.com> | 2009-11-05 17:54:51 -0800 |
---|---|---|
committer | palange <palange@lindenlab.com> | 2009-11-05 17:54:51 -0800 |
commit | 4ead03acd094d8418f9fe0f883e776ce8b209722 (patch) | |
tree | 1ae53248e9a643c9f27333aabc31ff0291e59b45 /indra/newview/app_settings | |
parent | ec32310c8602bf4dc69ed27e8c177cbd32c24411 (diff) | |
parent | 81192236ac44ea500ea6ec6f8de32be11e9165ca (diff) |
merge to viewer-2-0
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 7254fff664..e8af26c743 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -133,7 +133,7 @@ <key>Value</key> <integer>1</integer> </map> - <key>ArrowKeysMoveAvatar</key> + <key>ArrowKeysAlwaysMove</key> <map> <key>Comment</key> <string>While cursor is in chat entry box, arrow keys still control your avatar</string> @@ -142,7 +142,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>1</integer> + <integer>0</integer> </map> <key>AskedAboutCrashReports</key> <map> @@ -5473,7 +5473,18 @@ <key>QAModeEventHostPort</key> <map> <key>Comment</key> - <string>Enable Testing Features.</string> + <string>Port on which lleventhost should listen</string> + <key>Persist</key> + <integer>0</integer> + <key>Type</key> + <string>S32</string> + <key>Value</key> + <integer>-1</integer> + </map> + <key>QAModeTermCode</key> + <map> + <key>Comment</key> + <string>On LL_ERRS, terminate with this code instead of OS message box</string> <key>Persist</key> <integer>0</integer> <key>Type</key> |