diff options
author | skolb <none@none> | 2009-12-03 09:18:11 -0800 |
---|---|---|
committer | skolb <none@none> | 2009-12-03 09:18:11 -0800 |
commit | 7851819c88e8049c1c3d07d279d479c53d5de777 (patch) | |
tree | e8c81e110a71427b64e0b34f4351e7acf44465f3 /indra/newview/app_settings | |
parent | 9b17e6710b713fa12f6db7d6f51d97e4052a0835 (diff) | |
parent | 57b68d9bfe25fc7b9efe41a9fa30935c156acb34 (diff) |
local merge
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 4a65b40658..6252bd002e 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1374,6 +1374,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>ChatWindow</key> + <map> + <key>Comment</key> + <string>Show chat in multiple windows(by default) or in one multi-tabbed window(requires restart)</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>S32</string> + <key>Value</key> + <integer>0</integer> + </map> <key>CheesyBeacon</key> <map> <key>Comment</key> @@ -9249,7 +9260,7 @@ <key>Type</key> <string>S32</string> <key>Value</key> - <integer>3</integer> + <integer>4</integer> </map> <key>UIMaxComboWidth</key> <map> |