summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-08-02 16:14:16 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-08-02 16:14:16 -0400
commitfce8bda3b6e502b3de9b6a34279255999478e407 (patch)
treea648f195bae8bd0204d9be5ebefecca6e1024c8c
parent0e3cea49aaba7fb9e4a75c4a76779ba9273549bf (diff)
parent254263cffce69d6c74da4fa3176299ad64143306 (diff)
merged .hgtags
-rw-r--r--.hgtags4
-rw-r--r--indra/newview/app_settings/settings.xml2
2 files changed, 5 insertions, 1 deletions
diff --git a/.hgtags b/.hgtags
index 7a431156b9..f37d1bd99b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -149,7 +149,11 @@ a9abb9633a266c8d2fe62411cfd1c86d32da72bf 2.7.1-release
09984bfa6cae17e0f72d02b75c1b7393c65eecfc 2.7.5-beta1
e1ed60913230dd64269a7f7fc52cbc6004f6d52c 2.8.0-start
502f6a5deca9365ddae57db4f1e30172668e171e 2.8.1-start
+6866d9df6efbd441c66451debd376d21211de39c DRTVWR-68_2.7.5-release
+6866d9df6efbd441c66451debd376d21211de39c 2.7.5-release
e1ed60913230dd64269a7f7fc52cbc6004f6d52c DRTVWR-71_2.8.0-beta1
e1ed60913230dd64269a7f7fc52cbc6004f6d52c 2.8.0-beta1
2c7e459e0c883f8e406b932e41e60097e9ee077e DRTVWR-73_2.8.1-beta1
2c7e459e0c883f8e406b932e41e60097e9ee077e 2.8.1-beta1
+493d9127ee50e84ba08a736a65a23ca86f7a5b01 DRTVWR-70_2.8.0-release
+493d9127ee50e84ba08a736a65a23ca86f7a5b01 2.8.0-release
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 6fd8588696..5ad62d28c0 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>