Melanie 89c9528e38 Merge branch 'avination' into careminster ...

Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs

2012-07-11 14:27:33 +01:00

..

ApplicationPlugins

Merge branch 'master' into careminster

2012-06-13 02:15:12 +01:00

Capabilities

Merge branch 'avination' into careminster

2012-07-06 20:51:18 +01:00

ConsoleClient

Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.

2011-10-25 20:24:21 +01:00

Data

Merge branch 'avination' into careminster

2012-07-11 14:27:33 +01:00

Framework

Merge branch 'avination' into careminster

2012-07-11 14:27:33 +01:00

Region

Merge branch 'avination' into careminster

2012-07-11 14:27:33 +01:00

Server

Merge branch 'avination' into careminster

2012-07-11 14:27:33 +01:00

Services

Merge branch 'master' into careminster

2012-07-05 22:17:39 +01:00

Tests

Merge branch 'master' into careminster

2012-07-11 03:56:50 +01:00

Tools

If logging a client out due to ack timeout, do this asynchronously rather than synchronously on the outgoing packet loop.

2012-06-08 03:53:03 +01:00