Melanie b39de2425c Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/CoreModules/World/Land/LandObject.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2012-04-07 04:52:14 +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

OpenID auth needs hashing before authenticating

2012-03-02 15:05:06 -05: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

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

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

Grid

Change URI to lowercase to match existing

2012-01-19 13:55:53 -05:00

GridUser

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

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

Hypergrid

HG Friends: reroute the status notifications to the HGFriends service, so that they can scale better. They were previously being handled by the UAS; that is still there, but it's now obsolete and will be removed in a future release.

2012-03-21 10:35:06 -07: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

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

2011-12-05 20:44:20 +00: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