diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-08-08 16:22:04 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-08-08 16:22:04 -0700 |
| commit | 133900d31a4f75621bad070043f5ef0125708a88 (patch) | |
| tree | 3a2d12dd5eeb102bd126eaae3463c878704ed594 /indra | |
| parent | 881ee670d92f13ac518a74e1bff81bf69e07ccfa (diff) | |
Miss an || && in an if
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llinventory/llsettingsdaycycle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llinventory/llsettingsdaycycle.cpp b/indra/llinventory/llsettingsdaycycle.cpp index 84ef145913..ea57c8987f 100644 --- a/indra/llinventory/llsettingsdaycycle.cpp +++ b/indra/llinventory/llsettingsdaycycle.cpp @@ -340,7 +340,7 @@ bool LLSettingsDay::initialize(bool validate_frames) } if ((iter->first <= (new_frame + DEFAULT_MULTISLIDER_INCREMENT) && (new_frame - DEFAULT_FRAME_SLOP_FACTOR) <= iter->first) - || iter->first > new_frame && (new_frame - DEFAULT_FRAME_SLOP_FACTOR) <= (iter->first - 1)) + || ((iter->first > new_frame) && ((new_frame - DEFAULT_FRAME_SLOP_FACTOR) <= (iter->first - 1)))) { // we are encroaching at new point as well found = iter->first; |