diff options
| -rw-r--r-- | indra/newview/llfloaterregioninfo.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index ee3d00206f..712cf921d2 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -3580,6 +3580,15 @@ void LLPanelEnvironmentInfo::onBtnApply() { return; } + + // If it's a single-preset day cycle, reset the frame time to a non-negative value + // so that the region setting is displayed in the floater as + // a day cycle, not a preset. (STORM-1289) + if (day_cycle.size() == 1 && day_cycle[0][0].asReal() < 0.0f) + { + LL_DEBUGS("Windlight") << "Fixing negative time" << LL_ENDL; + day_cycle[0][0] = 0.0f; + } } // Get water params. |