From e947481d30b51e731947d85de45065d5b0c02e45 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Mon, 27 Nov 2017 15:17:54 -0800 Subject: Start viewer/common split --- indra/newview/llsettingsdaycycle.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llsettingsdaycycle.cpp') diff --git a/indra/newview/llsettingsdaycycle.cpp b/indra/newview/llsettingsdaycycle.cpp index 391aeddf1c..a579f99182 100644 --- a/indra/newview/llsettingsdaycycle.cpp +++ b/indra/newview/llsettingsdaycycle.cpp @@ -115,9 +115,9 @@ const std::string LLSettingsDay::SETTING_KEYNAME("key_name"); const std::string LLSettingsDay::SETTING_KEYKFRAME("key_keyframe"); const std::string LLSettingsDay::SETTING_TRACKS("tracks"); -//const S64 LLSettingsDayCycle::MINIMUM_DAYLENGTH( 300); // 5 mins +const S64 LLSettingsDay::MINIMUM_DAYLENGTH( 300); // 5 mins -const S64 LLSettingsDay::MINIMUM_DAYLENGTH( 14400); // 4 hours +//const S64 LLSettingsDay::MINIMUM_DAYLENGTH( 14400); // 4 hours const S64 LLSettingsDay::MAXIMUM_DAYLENGTH(604800); // 7 days const S32 LLSettingsDay::TRACK_WATER(0); // water track is 0 -- cgit v1.3