Melanie 84377a23db Merge branch 'avination' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
	OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
	OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs

2012-06-11 16:56:40 +01:00

..

ApplicationPlugins

Merge branch 'avination' into careminster

2012-06-06 14:16:19 +01:00

Capabilities

Fix build break whree accidentally did inv.Folders rather than inv.Folders.Count in a minor change.

2012-06-02 05:03:56 +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-06-11 16:56:40 +01:00

Framework

Merge branch 'master' into careminster

2012-06-09 16:28:22 +01:00

Region

Merge branch 'avination' into careminster

2012-06-11 16:56:40 +01:00

Server

Merge branch 'master' into careminster

2012-05-27 19:24:30 +01:00

Services

Merge branch 'avination' into careminster

2012-06-11 16:56:40 +01:00

Tests

Merge branch 'avination' into careminster

2012-06-11 16:56:40 +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