Melanie 36e6edfc65 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs		2012-01-26 00:44:32 +00:00
..
ApplicationPlugins	Merge branch 'master' into careminster	2012-01-06 22:41:26 +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-01-26 00:21:21 +00:00
Framework	Merge branch 'master' into careminster	2012-01-26 00:21:21 +00:00
Region	Merge branch 'master' into careminster	2012-01-26 00:44:32 +00:00
Server	Merge branch 'master' into careminster	2012-01-25 00:45:57 +00:00
Services	Allow retrival of multiple user records in one operation, analog to presence	2012-01-16 23:09:24 +00:00
Tests	Merge branch 'master' into careminster	2012-01-21 19:52:33 +00:00
Tools	minor: add missing newlines to pCampbot usage statement	2012-01-03 15:42:36 +00:00