From 099da38ca9d6fc4c257d58f92f3892f7fd0fbfc6 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Wed, 20 Apr 2011 23:35:43 +0300 Subject: 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. --- indra/newview/llfloaterdaycycle.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra') 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; } -- cgit v1.2.3