Melanie 1f32730798 Merge branch 'master' into careminster ... Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs		2012-03-03 09:58:57 +00:00
..
ApplicationPlugins	Merge branch 'master' into careminster	2012-02-04 11:48:20 +00:00
Capabilities	Implement the FetchInventory2 capability. This accompanies the existing FetchInventoryDescendents2 capability.	2012-01-06 21:07:34 +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	Merge branch 'master' into careminster	2012-03-03 09:58:57 +00:00
Framework	Merge branch 'master' into careminster	2012-03-03 09:58:57 +00:00
Region	Merge branch 'master' into careminster	2012-03-03 09:58:57 +00:00
Server	Merge branch 'master' into careminster	2012-02-23 01:49:14 +00:00
Services	Revert "Fix authentication for OpenID provider"	2012-02-29 15:52:15 -05:00
Tests	Merge branch 'master' into careminster	2012-03-03 09:58:57 +00:00
Tools	minor: Rename pCampbot console prompt to "pCampbot" rather than "Region"	2012-03-02 01:54:48 +00:00