diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-16 08:04:49 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-16 08:04:49 -0400 |
| commit | ae805d511d6135fec3938d822d7e6542d605cb7b (patch) | |
| tree | dfbfae2b751c7f8ecd0589d5fff57c964e8c05a5 | |
| parent | 94adbe81af50ac66e4ebbeb520aa31b4ee76e211 (diff) | |
| parent | 54bb91fd03d0c2f2600993274c59ae89324eeb03 (diff) | |
merge late release changes and tags
| -rw-r--r-- | .hgtags | 4 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -129,6 +129,8 @@ dac76a711da5f1489a01c1fa62ec97d99c25736d 2.6.6-release 54fd44ac92e4c61435ea33effe093a3527e18d98 2.7.1-start 0c4d0c24278074f219e5a32e72b449e78301d11b DRTVWR-61_2.7.1-beta1 0c4d0c24278074f219e5a32e72b449e78301d11b 2.7.1-beta1 +a9abb9633a266c8d2fe62411cfd1c86d32da72bf DRTVWR-60_2.7.1-release +a9abb9633a266c8d2fe62411cfd1c86d32da72bf 2.7.1-release 9f79a6ed8fdcd2f3dac33ea6b3236eeb278dccfe 2.7.2-start e0dc8b741eaa27dcdfbc9e956bb2579b954d15eb DRTVWR-63_2.7.2-beta1 e0dc8b741eaa27dcdfbc9e956bb2579b954d15eb 2.7.2-beta1 @@ -136,6 +138,8 @@ e0dc8b741eaa27dcdfbc9e956bb2579b954d15eb 2.7.2-beta1 6af10678de4736222b2c3f7e010e984fb5b327de 2.7.4-start be963a4eef635542f9617d7f5fd22ba48fb71958 DRTVWR-67_2.7.4-beta1 be963a4eef635542f9617d7f5fd22ba48fb71958 2.7.4-beta1 +057f319dd8eccdf63a54d99686c68cdcb31b6abc DRTVWR-66_2.7.4-release +057f319dd8eccdf63a54d99686c68cdcb31b6abc 2.7.4-release a9abb9633a266c8d2fe62411cfd1c86d32da72bf DRTVWR-60_2.7.1-release be963a4eef635542f9617d7f5fd22ba48fb71958 DRTVWR-67_2.7.4-beta1 be963a4eef635542f9617d7f5fd22ba48fb71958 2.7.4-beta1 diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 4b62e376b5..91cbfde07f 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12584,7 +12584,7 @@ <key>Type</key> <string>S32</string> <key>Value</key> - <integer>20</integer> + <integer>-1</integer> </map> <key>WaterGLFogDensityScale</key> <map> |