diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-03 15:41:36 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-03 15:41:36 -0500 |
| commit | 1ffd7c99afe25da37a83a2a1dd8a03c7275a5f6b (patch) | |
| tree | ad40ea009c5ebea67dd5334d210d90b6dbeebbd3 /indra/newview/app_settings/settings.xml | |
| parent | 202d86b15567a783bed55849a7cdc8ad8d8f874f (diff) | |
| parent | a9609ae1557a70e095088e0a9b6ef5564dfdb388 (diff) | |
automated merge for avp->avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -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 63e17058e8..fa4dfe767b 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1385,6 +1385,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> @@ -9260,7 +9271,7 @@ <key>Type</key> <string>S32</string> <key>Value</key> - <integer>3</integer> + <integer>4</integer> </map> <key>UIMaxComboWidth</key> <map> |