Melanie 0c00abcce1 Merge branch 'master' into careminster ...

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

2012-08-03 16:46:11 +01:00

..

Application

Merge branch 'master' into careminster

2012-08-01 23:03:03 +01:00

ClientStack

Merge branch 'master' into careminster

2012-07-28 00:39:36 +01:00

CoreModules

Merge branch 'master' into careminster

2012-08-03 16:46:11 +01:00

DataSnapshot

minor: resolve some mono compiler warnings

2012-05-03 01:56:24 +01:00

Framework

Merge branch 'master' into careminster

2012-08-03 16:46:11 +01:00

OptionalModules

Merge branch 'master' into careminster

2012-08-03 16:46:11 +01:00

Physics

Merge branch 'master' into careminster

2012-08-03 16:46:11 +01:00

RegionCombinerModule

Fix issue where RegionCombinerModule was not removing regions from its dictionary on RemoveRegion(), causing a later issue if regions were restarted (removed then readded).

2012-07-27 00:28:23 +01:00

ReplaceableModules

…

ScriptEngine

Merge branch 'master' into careminster

2012-08-03 16:46:11 +01:00

UserStatistics

Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.

2012-07-25 23:11:50 +01:00