Melanie 522f36345d Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/SimStatsReporter.cs

2012-06-02 01:40:42 +01:00

..

ApplicationPlugins

Merge branch 'avination'

2012-05-29 08:45:44 +02:00

Capabilities

Environment Module - allows Environment settings for Viewer3 warning: includes database region store migrations for mssql, mysql, sqlite

2012-05-23 17:04:19 -04: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 'master' into careminster

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

Framework

Merge branch 'master' into careminster

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

Region

Merge branch 'master' into careminster

2012-06-02 01:40:42 +01:00

Server

Merge branch 'master' into careminster

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

Services

Merge branch 'master' into careminster

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

Tests

Merge branch 'master' into careminster

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

Tools

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

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