summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-11-19 17:03:05 -0500
committerOz Linden <oz@lindenlab.com>2010-11-19 17:03:05 -0500
commit3337ef16cee97e26b45aa07518d34d031bdc75fa (patch)
treeb3302fdbae8802ac4d209c960a5b9629938182f2 /indra/newview/app_settings/settings.xml
parent2eec4949cc49f3c59cdc278be0e7eed1e092b167 (diff)
parentf6ba55b8ed24246be340d069c64d25bd614194a6 (diff)
Automated merge with file:///Users/oz/Work/viewer-development
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index aad2fe3276..e5845bc947 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1365,6 +1365,17 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>LetterKeysFocusChatBar</key>
+ <map>
+ <key>Comment</key>
+ <string>When printable characters keys (possibly with Shift held) are pressed, the chatbar takes focus</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>S32</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>ChatBubbleOpacity</key>
<map>
<key>Comment</key>