OpenSimMirror/OpenSim/Services/Connectors
Melanie f70357eaa3 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Framework/Monitoring/BaseStatsCollector.cs
	OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
	OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2013-06-23 01:59:57 +01:00
..
Asset Remove Temporary from use to shortcut asset stores. The Local property 2013-06-10 13:26:19 -07:00
Authentication Add a real_id field to the login response if impersonation is used. The wrapper 2012-08-15 23:31:38 +02:00
Authorization Where necessary, rename OpenSim/Services/Connectors/*.cs files to reflect the actual class names. 2012-05-09 23:25:01 +01:00
Avatar Where necessary, rename OpenSim/Services/Connectors/*.cs files to reflect the actual class names. 2012-05-09 23:25:01 +01:00
Freeswitch Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd. 2011-04-12 20:24:28 -07:00
Friends Merge branch 'master' into careminster 2012-10-20 02:33:24 +01:00
Grid Merge branch 'master' into careminster 2012-05-10 00:42:10 +01:00
GridUser One more abstraction for GridUser so that it can be overridden in a sub-class. 2012-10-04 15:32:49 -07:00
Hypergrid Merge branch 'master' into careminster 2013-06-23 01:59:57 +01:00
InstantMessage HG IM: increase the timeout value 2011-06-02 10:44:10 -07:00
Inventory Make XInventoryServicesConnector properly handle a RESULT = false return for methods where this contains failure rather than throwing an exception. 2013-06-13 00:31:32 +01:00
Land Merge branch 'master' into careminster 2012-05-10 00:42:10 +01:00
MapImage Where necessary, rename OpenSim/Services/Connectors/*.cs files to reflect the actual class names. 2012-05-09 23:25:01 +01:00
Neighbour Merge branch 'master' into careminster 2013-02-27 18:05:04 +00:00
Presence Merge branch 'master' into careminster 2012-05-10 00:42:10 +01:00
Properties Deleted all AssemblyFileVersion directives 2013-02-19 17:14:55 -08:00
SimianGrid Merge branch 'master' into careminster 2013-04-10 13:20:55 +01:00
Simulation Merge branch 'master' into careminster 2013-06-23 01:59:57 +01:00
UserAccounts Merge branch 'master' into careminster 2013-02-10 00:17:14 +00:00