diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-04-20 23:35:43 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-04-20 23:35:43 +0300 |
| commit | 099da38ca9d6fc4c257d58f92f3892f7fd0fbfc6 (patch) | |
| tree | 8a2c6f8ae17bb0de8c529d489ca6e42fb793eb0c /indra/newview | |
| parent | db6862e15b1ff6257593eab798250316a350cf73 (diff) | |
STORM-1158 FIX Added notification when day cycle keyframe limit is reached.
Fixed a seemingly wrong condition.
Besides, fixed a runtime warning (nonexistent functor) shown when you click "OK" in the notification.
Diffstat (limited to 'indra/newview')
| -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; } |