Melanie e4659a83f1 Merge branch 'master' into careminster

2012-11-17 02:03:24 +00:00

..

Asset

Merge branch 'avination' into careminster

2012-10-07 03:12:21 +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

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

2012-11-09 22:58:42 +00:00

InstantMessage

HG IM: increase the timeout value

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

Inventory

Change exception log messages in XInventoryService connector to error rather than debug, since these signal real problems.

2012-08-01 00:11:21 +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

Squash reporting HelloNeighbor exception - it simply means the other sim

2012-11-02 16:43:38 +01:00

Presence

Merge branch 'master' into careminster

2012-05-10 00:42:10 +01:00

Properties

The last few AssemblyInfos. Finished!

2012-11-14 21:18:18 -08:00

SimianGrid

Merge branch 'master' into careminster

2012-11-17 02:03:24 +00:00

Simulation

Make friend notifies and closing child agents async because both can

2012-09-04 22:53:52 +02:00

UserAccounts

Merge branch 'master' into careminster

2012-05-10 00:42:10 +01:00