Melanie 596af3f600 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs		2009-12-30 20:12:21 +00:00
..
ApplicationPlugins	…
Client	…
ConsoleClient	…
Data	…
Framework	Merge branch 'master' into careminster	2009-12-29 18:41:45 +00:00
Grid	…
Region	Merge branch 'master' into careminster	2009-12-30 20:12:21 +00:00
Server	…
Services	…
TestSuite	…
Tests	…
Tools	…