Melanie 31ab8b2fe0 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/WebUtil.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

2012-05-05 10:32:04 +01:00

..

Asset

Send the config section name up to the service classes themselves (XInventory and Assets).

2012-03-27 10:08:13 -07:00

Authentication

Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable.

2012-05-03 01:45:49 +01:00

Authorization

Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.

2011-12-05 20:44:20 +00:00

Avatar

Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.

2011-12-05 20:44:20 +00:00

Base

Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.

2011-12-05 20:44:20 +00:00

Freeswitch

Implement a method to allow regions to query the gridwide Freeswitch

2010-11-21 22:17:25 +00:00

Friends

Remove the somewhat misleading logging of the string length of some unknown requests, as this appeared to be some kind of numbered error code.

2012-05-03 02:22:06 +01:00

Grid

Remove the somewhat misleading logging of the string length of some unknown requests, as this appeared to be some kind of numbered error code.

2012-05-03 02:22:06 +01:00

GridUser

Allow retrival of multiple user records in one operation, analog to presence

2012-01-16 23:09:24 +00:00

Hypergrid

Remove the somewhat misleading logging of the string length of some unknown requests, as this appeared to be some kind of numbered error code.

2012-05-03 02:22:06 +01:00

Inventory

Finish the implementation of GetUserInventory, even though it's still not used.

2012-04-06 11:38:47 -07:00

Land

Implement Scope ID lookup on GetLandData. Stacked regions were not handled

2011-01-03 19:40:55 +00:00

Login

Comment out login parameters debug output accidentally included with c4b2d24

2012-03-22 23:31:41 +00:00

Map

MapImageService: changed the event at which the map tiles are uploaded, because they were being uploaded before the region was registered with the grid

2012-04-27 11:05:40 -07:00

Neighbour

Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.

2011-12-05 20:44:20 +00:00

Presence

Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.

2011-12-05 20:44:20 +00:00

Simulation

Merge branch 'master' into careminster

2012-03-14 11:33:51 +00:00

UserAccounts

Fixed mix-up in UserAccount fields when passing UserAccounts remotely.

2011-12-29 12:34:57 -08:00