diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-22 18:25:57 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-22 18:25:57 -0400 |
| commit | c3df5f5d675abd107e1f0b4e3fb262226978ddb5 (patch) | |
| tree | b89e53c972d8db034d74e1dbc55bf27ab82d3b88 /indra/newview/app_settings | |
| parent | 391bef0df021dd3a56c262087ba977ab9f2bb662 (diff) | |
| parent | 95847fc2061e9b71a4d2ce078b525c047fc4ad36 (diff) | |
merge up latest viewer-development
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 38 |
1 files changed, 11 insertions, 27 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 4e666952ce..d247ed4dc9 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11322,6 +11322,17 @@ <key>Value</key> <integer>1</integer> </map> + <key>UseEnvironmentFromRegion</key> + <map> + <key>Comment</key> + <string>Choose whether to use the region's environment settings, or override them with the local settings.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>UseExternalBrowser</key> <map> <key>Comment</key> @@ -11915,33 +11926,6 @@ <key>Value</key> <integer>0</integer> </map> - <key>WaterFogColor</key> - <map> - <key>Comment</key> - <string>Water fog color</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Color4</string> - <key>Value</key> - <array> - <real>0.0863</real> - <real>0.168</real> - <real>0.212</real> - <real>0</real> - </array> - </map> - <key>WaterFogDensity</key> - <map> - <key>Comment</key> - <string>Water fog density</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>F32</string> - <key>Value</key> - <real>16.0</real> - </map> <key>WaterGLFogDensityScale</key> <map> <key>Comment</key> |