summaryrefslogtreecommitdiff
path: root/indra/newview/llsettingsdaycycle.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2017-11-27 15:17:54 -0800
committerRider Linden <rider@lindenlab.com>2017-11-27 15:17:54 -0800
commite947481d30b51e731947d85de45065d5b0c02e45 (patch)
treeec9ef04c1ba175aa6e49b96e072e24286baadff3 /indra/newview/llsettingsdaycycle.cpp
parent28b98374da7acf4fc2eec2a243e951d1786f33a1 (diff)
Start viewer/common split
Diffstat (limited to 'indra/newview/llsettingsdaycycle.cpp')
-rw-r--r--indra/newview/llsettingsdaycycle.cpp4
1 files changed, 2 insertions, 2 deletions
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