Melanie b970d4f976 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs		2011-12-22 16:37:25 +00:00
..
ApplicationPlugins	Merge branch 'master' into careminster	2011-12-19 21:30:57 +00:00
Capabilities	Migrate detailed "appearance show" report generation up to AvatarFactoryModule from AppearanceInfoModule so that it can be used in debug (inactive).	2011-12-19 18:58:05 +00:00
ConsoleClient	Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.	2011-10-25 20:24:21 +01:00
Data	Spin off terrain save into a new thread and make it so that it uses the old	2011-12-13 12:58:28 +01:00
Framework	Merge branch 'master' into careminster	2011-12-20 21:51:43 +00:00
Region	Merge branch 'master' into careminster	2011-12-22 16:37:25 +00:00
Server	Merge branch 'master' into careminster	2011-12-18 10:49:45 +00:00
Services	Merge branch 'master' into careminster	2011-12-22 16:37:25 +00:00
Tests	Merge branch 'master' into careminster	2011-12-10 15:19:31 +00:00
Tools	Fix off by one bug in objects GrabbingBehaviour of pCampBot.exe	2011-12-14 16:43:49 +00:00