diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-22 18:24:07 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-22 18:24:07 -0400 |
| commit | 95847fc2061e9b71a4d2ce078b525c047fc4ad36 (patch) | |
| tree | 242a042e5b71bd238ee9b475b629f5c8def5f7ef /indra | |
| parent | fe680f329953694bfd72be5c6f42411b017ed740 (diff) | |
| parent | bc3317576fd48e2b2d42edaba0ad3d765a726959 (diff) | |
merge latest from windlight integration branch
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterdaycycle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterdaycycle.cpp b/indra/newview/llfloaterdaycycle.cpp index 6b5b3ee106..eb429d7803 100644 --- a/indra/newview/llfloaterdaycycle.cpp +++ b/indra/newview/llfloaterdaycycle.cpp @@ -554,7 +554,7 @@ void LLFloaterDayCycle::onAddKey(void* userData) break; } - if (sSliderToKey.size() >= max_sliders) + if ((S32)sSliderToKey.size() >= max_sliders) { LLSD args; args["SCOPE"] = LLEnvManager::getScopeString(sScope); |