diff options
| author | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
| commit | fdf944fb0355249d73c4e25ee86e9ffd378e7d4b (patch) | |
| tree | 2e5c51fe0e6d5757f984721e01cc097801d927e7 /linden/indra/newview/app_settings/settings.xml | |
| parent | Rebranded Windows-specific installer/support files. (diff) | |
| parent | Updated source to SL version 1.21.6. (diff) | |
| download | meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.zip meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.gz meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.bz2 meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.xz | |
Merge branch 'merge-1.21.6' into rebranding
Conflicts:
linden/indra/newview/installers/windows/installer_template.nsi
linden/indra/newview/llappviewer.cpp
Diffstat (limited to 'linden/indra/newview/app_settings/settings.xml')
| -rw-r--r-- | linden/indra/newview/app_settings/settings.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index be78dd7..550a30d 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml | |||
| @@ -5063,10 +5063,10 @@ | |||
| 5063 | <string>Color4</string> | 5063 | <string>Color4</string> |
| 5064 | <key>Value</key> | 5064 | <key>Value</key> |
| 5065 | <array> | 5065 | <array> |
| 5066 | <real>1</real> | 5066 | <real>0.699999988079</real> |
| 5067 | <real>0.5</real> | 5067 | <real>0.899999976158</real> |
| 5068 | <real>0.0</real> | 5068 | <real>0.699999988079</real> |
| 5069 | <real>1</real> | 5069 | <real>1</real> |
| 5070 | </array> | 5070 | </array> |
| 5071 | </map> | 5071 | </map> |
| 5072 | <key>OpenDebugStatAdvanced</key> | 5072 | <key>OpenDebugStatAdvanced</key> |