Melanie ff21007b93 Merge branch 'avination' into careminster ...

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2012-06-15 15:48:34 +01:00

..

ApplicationPlugins

Merge branch 'master' into careminster

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

Capabilities

Don't include time to transmit response back to requester when assessing slow handling of requests.

2012-06-13 00:03:44 +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-15 02:53:34 +01:00

Region

Merge branch 'avination' into careminster

2012-06-15 15:48:34 +01:00

Server

Merge branch 'master' into careminster

2012-06-15 02:53:34 +01:00

Services

Merge branch 'master' into careminster

2012-06-14 00:10:52 +01:00

Tests

Merge branch 'master' into careminster

2012-06-14 00:10:52 +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