diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-05-22 09:58:47 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-05-22 09:58:47 +0000 |
| commit | 9dfe0ca9a0228c4fa75c8a3e51840696cc6b4960 (patch) | |
| tree | 3136e0a32cdcb1d55a4c3a5a67791ca128d947a5 /indra/newview/app_settings | |
| parent | 93cf3d89e51835dd2f61c32b16191ab724528055 (diff) | |
svn merge -r121194:121210
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1
QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 0081893869..7ae92129dc 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -4801,16 +4801,16 @@ <real>1.0</real> </array> </map> - <key>IMInChatHistory</key> + <key>IMInChatConsole</key> <map> <key>Comment</key> - <string>Copy IM into chat history</string> + <string>Copy IM into background chat console</string> <key>Persist</key> <integer>1</integer> <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>IMShowTimestamps</key> <map> @@ -6501,8 +6501,8 @@ <key>Value</key> <array> <integer>0</integer> - <integer>550</integer> - <integer>500</integer> + <integer>586</integer> + <integer>576</integer> <integer>0</integer> </array> </map> @@ -7383,6 +7383,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>RenderHUDParticles</key> + <map> + <key>Comment</key> + <string>Display particle systems in HUD attachments (experimental)</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>RenderHiddenSelections</key> <map> <key>Comment</key> @@ -11629,7 +11640,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>1</integer> + <integer>0</integer> </map> <key>WaterEditPresets</key> <map> |