diff options
| author | James Cook <james@lindenlab.com> | 2009-07-06 21:58:04 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-07-06 21:58:04 +0000 |
| commit | d6101558a171dbd2390792ac1e78d09fc2c27711 (patch) | |
| tree | e5fea96c850fb254237c2869f2234fc4a4367e98 /indra/newview/app_settings | |
| parent | 39905b927d60e204438705728d2c214cb3f9ef81 (diff) | |
Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux.
svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 89 |
1 files changed, 67 insertions, 22 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index afa7f707f1..567fda0034 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3329,17 +3329,6 @@ <key>Value</key> <integer>0</integer> </map> - <key>NotFullScreen</key> - <map> - <key>Comment</key> - <string>Run SL in non fullscreen mode</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> <key>FullScreenAspectRatio</key> <map> <key>Comment</key> @@ -5460,17 +5449,6 @@ <key>Value</key> <integer>1</integer> </map> - <key>RenderCustomSettings</key> - <map> - <key>Comment</key> - <string>Do you want to set the graphics settings yourself</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> <key>RenderDebugAlphaMask</key> <map> <key>Comment</key> @@ -5758,6 +5736,21 @@ <key>Value</key> <integer>2</integer> </map> + <key>RenderGlowLumWeights</key> + <map> + <key>Comment</key> + <string>Weights for each color channel to be used in calculating luminance (should add up to 1.0)</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Vector3</string> + <key>Value</key> + <array> + <real>0.299</real> + <real>0.587</real> + <real>0.114</real> + </array> + </map> <key>RenderGlowMaxExtractAlpha</key> <map> <key>Comment</key> @@ -5813,6 +5806,21 @@ <key>Value</key> <real>0.0</real> </map> + <key>RenderGlowWarmthWeights</key> + <map> + <key>Comment</key> + <string>Weight of each color channel used before finding the max warmth</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Vector3</string> + <key>Value</key> + <array> + <real>1.0</real> + <real>0.5</real> + <real>0.7</real> + </array> + </map> <key>RenderGlowWidth</key> <map> <key>Comment</key> @@ -6589,6 +6597,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>ShowAdvancedGraphicsSettings</key> + <map> + <key>Comment</key> + <string>Show advanced graphics settings</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>ShowAllObjectHoverTip</key> <map> <key>Comment</key> @@ -7230,6 +7249,21 @@ <key>Value</key> <integer>0</integer> </map> + <key>SkyNightColorShift</key> + <map> + <key>Comment</key> + <string>Controls moonlight color (base color applied to moon as light source)</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Color3</string> + <key>Value</key> + <array> + <real>0.67</real> + <real>0.67</real> + <real>1.0</real> + </array> + </map> <key>SkyOverrideSimSunPosition</key> <map> <key>Comment</key> @@ -9314,6 +9348,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>WindowFullScreen</key> + <map> + <key>Comment</key> + <string>Run SL in fullscreen mode</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>WindowHeight</key> <map> <key>Comment</key> |