livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge back beta tags

meow-7.2.2
Oz Linden 2011-08-08 10:08:22 -04:00
parent 33fa30f526 8c5da0552d
commit 09dc3fd81b
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.hgtags
View File

@ -158,7 +158,8 @@ e1ed60913230dd64269a7f7fc52cbc6004f6d52c 2.8.0-beta1
2c7e459e0c883f8e406b932e41e60097e9ee077e DRTVWR-73_2.8.1-beta1
2c7e459e0c883f8e406b932e41e60097e9ee077e 2.8.1-beta1
54bc7823ad4e3a436fef79710f685a7372bbf795 2.8.2-start
493d9127ee50e84ba08a736a65a23ca86f7a5b01 2.8.0-release
29e93d7e19991011bd12b5748142b11a5dcb4370 DRTVWR-72_2.8.1-release
29e93d7e19991011bd12b5748142b11a5dcb4370 2.8.1-release
ac0f1a132d35c02a58861d37cca75b0429ac9137 2.8.3-start
599677276b227357140dda35bea4a2c18e2e67b5 DRTVWR-75_2.8.3-beta1
599677276b227357140dda35bea4a2c18e2e67b5 2.8.3-beta1

8
indra/newview/app_settings/settings.xml
View File

@ -12629,13 +12629,21 @@
<key>WatchdogEnabled</key>
<map>
<key>Comment</key>
<<<<<<< local
<string>Controls whether the thread watchdog timer is activated.</string>
=======
<string>Controls whether the thread watchdog timer is activated. Value is boolean. Set to -1 to defer to built-in default.</string>
>>>>>>> other
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<<<<<<< local
<integer>-1</integer>
=======
<integer>0</integer>
>>>>>>> other
</map>
<key>WaterGLFogDensityScale</key>
<map>