From 65f534899740018b8efb662f8154030edb07fc0f Mon Sep 17 00:00:00 2001 From: "nyx@NyxTop" Date: Thu, 29 Oct 2009 15:13:27 -0400 Subject: EXT-1945 visual parameter animations broken First round of fixes for trying to fix the visual param animations Code reviewed by Seraph --- indra/newview/llagentwearables.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/llagentwearables.cpp') diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index b9a0b4293d..d764dc4f3a 100644 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -1985,6 +1985,17 @@ bool LLAgentWearables::canWearableBeRemoved(const LLWearable* wearable) const return !(((type == WT_SHAPE) || (type == WT_SKIN) || (type == WT_HAIR) || (type == WT_EYES)) && (getWearableCount(type) <= 1) ); } +void LLAgentWearables::animateAllWearableParams(F32 delta, BOOL set_by_user) +{ + for( S32 type = 0; type < WT_COUNT; ++type ) + { + for (S32 count = 0; count < getWearableCount((EWearableType)type); ++count) + { + LLWearable *wearable = getWearable((EWearableType)type,count); + wearable->animateParams(delta, set_by_user); + } + } +} void LLAgentWearables::updateServer() { -- cgit v1.3 From 8bf1dd2f1be96ea6b060772d9c70ba6b855f9f27 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Thu, 29 Oct 2009 17:42:32 -0400 Subject: previous checkin had a signed/unsigned mismatch. Using a cast to fix it. --- indra/newview/llagentwearables.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llagentwearables.cpp') diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index d764dc4f3a..89a7d8b91f 100644 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -1989,7 +1989,7 @@ void LLAgentWearables::animateAllWearableParams(F32 delta, BOOL set_by_user) { for( S32 type = 0; type < WT_COUNT; ++type ) { - for (S32 count = 0; count < getWearableCount((EWearableType)type); ++count) + for (S32 count = 0; count < (U32)getWearableCount((EWearableType)type); ++count) { LLWearable *wearable = getWearable((EWearableType)type,count); wearable->animateParams(delta, set_by_user); -- cgit v1.3 From f553f7fd157d5f72d640cfea9cf4e4a7cc8e636c Mon Sep 17 00:00:00 2001 From: James Cook Date: Thu, 29 Oct 2009 16:07:00 -0700 Subject: Fix signed/unsigned mismatch breaking the build. --- indra/newview/llagentwearables.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llagentwearables.cpp') diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index 89a7d8b91f..380469f5b3 100644 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -1989,7 +1989,7 @@ void LLAgentWearables::animateAllWearableParams(F32 delta, BOOL set_by_user) { for( S32 type = 0; type < WT_COUNT; ++type ) { - for (S32 count = 0; count < (U32)getWearableCount((EWearableType)type); ++count) + for (S32 count = 0; count < (S32)getWearableCount((EWearableType)type); ++count) { LLWearable *wearable = getWearable((EWearableType)type,count); wearable->animateParams(delta, set_by_user); -- cgit v1.3