diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-21 10:00:28 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-21 10:00:28 -0400 |
| commit | fe680f329953694bfd72be5c6f42411b017ed740 (patch) | |
| tree | 90dc2541e0f59f4b4333c06b566d31bd09e94cf5 /indra | |
| parent | eb15f9a8cee3b09371690da9921351c2612b9781 (diff) | |
| parent | 099da38ca9d6fc4c257d58f92f3892f7fd0fbfc6 (diff) | |
combine with concurrent commit from vadim
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterdaycycle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterdaycycle.cpp b/indra/newview/llfloaterdaycycle.cpp index 8fec624edf..6b5b3ee106 100644 --- a/indra/newview/llfloaterdaycycle.cpp +++ b/indra/newview/llfloaterdaycycle.cpp @@ -554,12 +554,12 @@ void LLFloaterDayCycle::onAddKey(void* userData) break; } - if(kSldr->getValue().asInteger() >= max_sliders) + if (sSliderToKey.size() >= max_sliders) { LLSD args; args["SCOPE"] = LLEnvManager::getScopeString(sScope); args["MAX"] = max_sliders; - LLNotificationsUtil::add("DayCycleTooManyKeyframes", args); + LLNotificationsUtil::add("DayCycleTooManyKeyframes", args, LLSD(), LLNotificationFunctorRegistry::instance().DONOTHING); return; } |