From 875606a04d656ef6e5600a3a7fb6e8b52feb1945 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Sun, 11 May 2008 20:56:42 +0000 Subject: QAR-566 maint-viewer-5-merge-2 Effective merge: release@84102 maint-viewer-5@86348 -> maint-viewer-5-merge-2 Actual merge maint-viewer-5-merge-2 -r 87239 : 87246 -> release --- indra/llcharacter/llmotion.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/llcharacter/llmotion.h') diff --git a/indra/llcharacter/llmotion.h b/indra/llcharacter/llmotion.h index 7669920339..13825dde30 100644 --- a/indra/llcharacter/llmotion.h +++ b/indra/llcharacter/llmotion.h @@ -49,13 +49,13 @@ class LLCharacter; class LLMotion { public: - enum LLMotionBlendType + typedef enum LLMotionBlendType { NORMAL_BLEND, ADDITIVE_BLEND }; - enum LLMotionInitStatus + typedef enum LLMotionInitStatus { STATUS_FAILURE, STATUS_SUCCESS, -- cgit v1.2.3