Melanie ebd9d2618b Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs

2012-05-19 13:34:44 +01:00

..

ApplicationPlugins

Merge branch 'master' into careminster

2012-05-10 20:33:27 +01:00

Capabilities

Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable.

2012-05-03 01:45:49 +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-05-15 21:24:27 +01:00

Framework

Merge branch 'master' into careminster

2012-05-14 23:32:49 +01:00

Region

Merge branch 'master' into careminster

2012-05-19 13:34:44 +01:00

Server

Merge branch 'master' into careminster

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

Services

Merge branch 'master' into careminster

2012-05-19 13:34:44 +01:00

Tests

Merge branch 'master' into careminster

2012-05-17 13:28:25 +01:00

Tools

Invoke log4net configurator in pCampBot.exe in order to get OpenSim sylte logging

2012-05-18 00:49:39 +01:00