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

Merge branch 'master' into careminster

2012-03-09 02:39:14 +00:00

Authentication

Add optional getauthinfo and setauthinfo authentication service calls.

2011-10-24 21:40:36 +01:00

Authorization

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

Avatar

Add url to logging if SynchronousRestFormsRequester.MakRequest() throws an exception in service connectors

2012-02-07 21:40:28 +00: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

HG Friends: allow the establishment of HG friendships without requiring co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.

2012-03-20 17:14:19 -07:00

Grid

Add a cache on GridService requests

2012-02-24 18:17:30 +01:00

GridUser

Add url to logging if SynchronousRestFormsRequester.MakRequest() throws an exception in service connectors

2012-02-07 21:40:28 +00:00

Hypergrid

Merge branch 'master' into careminster

2012-03-22 20:38:49 +00:00

InstantMessage

HG IM: increase the timeout value

2011-06-02 10:44:10 -07:00

Inventory

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

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

Land

Merge branch 'master' into careminster-presence-refactor

2011-04-17 18:48:53 +01:00

MapImage

Add url to logging if SynchronousRestFormsRequester.MakRequest() throws an exception in service connectors

2012-02-07 21:40:28 +00:00

Neighbour

Improve the error messages returned if the HelloNeighbour call fails.

2011-11-21 22:06:43 +00:00

Presence

Merge branch 'master' into careminster

2012-02-07 23:30:48 +00:00

SimianGrid

Merge branch 'master' into careminster

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

Simulation

Merge branch 'master' into careminster

2012-02-23 01:49:14 +00:00

UserAccounts

Merge branch 'master' into careminster

2012-03-22 20:38:49 +00:00