Melanie 05cf51cbbd Merge branch 'avination' into careminster ...

Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs

2012-06-29 22:11:49 +01:00

..

ApplicationPlugins

Merge branch 'master' into careminster

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

Capabilities

As with LLSDInventoryItem from commit 01a2b0b, send type values in LLSDInventoryFolder for inventory CAPs as integers rather than strings.

2012-06-20 02:28:00 +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-29 22:11:49 +01:00

Framework

Merge branch 'avination' into careminster

2012-06-29 22:11:49 +01:00

Region

Merge branch 'avination' into careminster

2012-06-29 22:11:49 +01:00

Server

Merge branch 'master' into careminster

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

Services

Merge branch 'master' into careminster

2012-06-28 03:21:08 +01:00

Tests

Merge branch 'master' into careminster

2012-06-28 03:21:08 +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