Justin Clark-Casey (justincc) 1ad3fdb40b Merge branch 'master' of ssh://opensimulator.org/var/git/opensim		2012-04-13 22:34:36 +01:00
..
ApplicationPlugins	Changed save oar and save iar parameter -p|--profile to -h|--home, including corresponding RemoteAdmin parameter	2012-02-03 23:53:18 +01:00
Capabilities	Guard against null inventory contents.	2012-04-06 11:22:30 -07: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	Rename SOG.HasChildPrim(uint) to SOG.ContainsPart(uint) to match existing ContainsPart method and remove method duplication.	2012-03-31 01:45:37 +01:00
Framework	Thank you, BaseHttpServer, for telling me where things go wrong.	2012-04-06 11:21:27 -07:00
Region	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim	2012-04-13 22:34:36 +01:00
Server	Finish the implementation of GetUserInventory, even though it's still not used.	2012-04-06 11:38:47 -07:00
Services	Add uri to various log messages when region registration fails. Upgrade some debug log messages to error.	2012-04-10 20:40:59 +01:00
Tests	Add simple login test with online friends. Add IFriendsModule.GrantRights() for granting rights via a module call.	2012-03-30 00:42:55 +01:00
Tools	minor: Rename pCampbot console prompt to "pCampbot" rather than "Region"	2012-03-02 01:54:48 +00:00