Melanie 2f365ea80b Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs		2013-09-07 13:54:19 +01:00
..
Asset	Merge branch 'master' into careminster	2013-07-18 10:08:10 +01: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	Revert "More debug mantis #6625"	2013-06-30 07:25:46 -07:00
Grid	Merge branch 'master' into careminster	2013-09-07 13:54:19 +01:00
GridUser	Minor typo in log message	2013-07-14 14:29:10 -07:00
Hypergrid	Merge branch 'master' into careminster	2013-06-30 18:27:30 +01:00
InstantMessage	Several major improvements to group (V2) chat. Specifically: handle join/drop appropriately, invitechatboxes.	2013-07-27 15:38:56 -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-08-17 03:23:45 +01: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-09-07 13:54:19 +01:00
Simulation	Merge branch 'master' into careminster	2013-07-18 10:08:10 +01:00
UserAccounts	Merge branch 'master' into careminster	2013-02-10 00:17:14 +00:00