Melanie 0a876a305c Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs		2012-12-16 21:19:30 +00:00
..
AnimationSet.cs	Store and send the current movement animation state to a new sim on crossing	2012-10-30 23:08:22 +00:00
BinBVHAnimation.cs	refactor: move AvatarAnimations, BinBVHAnimation	2009-11-17 16:25:52 +00:00
DefaultAvatarAnimations.cs	refactor: Rename AvatarAnimations -> DefaultAvatarAnimations for code clarity since non-default animations are handled completely separately from this class	2012-03-22 00:10:41 +00:00
ScenePresenceAnimator.cs	Merge branch 'master' into careminster	2012-12-16 21:19:30 +00:00