1 files changed, 10 insertions, 8 deletions
diff --git a/indra/llcharacter/llmotioncontroller.h b/indra/llcharacter/llmotioncontroller.h
index d43d6d9a8f..a19e704643 100644
--- a/indra/llcharacter/llmotioncontroller.h
+++ b/indra/llcharacter/llmotioncontroller.h
@@ -16,7 +16,6 @@
 #include <map>
 #include <deque>
 
-#include "linked_lists.h"
 #include "lluuidhashmap.h"
 #include "llmotion.h"
 #include "llpose.h"
@@ -90,6 +89,10 @@ protected:
 class LLMotionController
 {
 public:
+	typedef std::list<LLMotion*> motion_list_t;
+	typedef std::set<LLMotion*> motion_set_t;
+	
+public:
 	// Constructor
 	LLMotionController();
 
@@ -145,12 +148,11 @@ public:
 	void setTimeFactor(F32 time_factor);
 	F32 getTimeFactor() { return mTimeFactor; }
 
-	LLMotion* getFirstActiveMotion();
-	LLMotion* getNextActiveMotion();
+	motion_list_t& getActiveMotions() { return mActiveMotions; }
 
 //protected:
-	BOOL isMotionActive( LLMotion *motion );
-	BOOL isMotionLoading( LLMotion *motion );
+	bool isMotionActive( LLMotion *motion );
+	bool isMotionLoading( LLMotion *motion );
 	LLMotion *findMotion( const LLUUID& id );
 
 protected:
@@ -180,9 +182,9 @@ protected:
 
 	std::map<LLUUID, LLMotion*>	mAllMotions;
 
-	LLLinkedList<LLMotion>		mLoadingMotions;
-	std::deque<LLMotion*>		mLoadedMotions;
-	LLLinkedList<LLMotion>		mActiveMotions;
+	motion_set_t		mLoadingMotions;
+	motion_list_t		mLoadedMotions;
+	motion_list_t		mActiveMotions;
 	
 	LLFrameTimer		mTimer;
 	F32					mTime;