diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-08 10:08:22 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-08 10:08:22 -0400 |
| commit | 09dc3fd81bbd927d389cf8a699bb2dfe67e7b820 (patch) | |
| tree | e941c78f70c67cdd3a85cb659434e59ff7e59aa0 | |
| parent | 33fa30f5261ed73698f65b3da4bef84e666d4db8 (diff) | |
| parent | 8c5da0552db39ba6031b76ffb08994e53217a559 (diff) | |
merge back beta tags
| -rw-r--r-- | .hgtags | 3 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 8 |
2 files changed, 10 insertions, 1 deletions
@@ -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 diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 01842d1037..9db59205bf 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -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> |