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

Conflicts:
	OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SimStatsReporter.cs

2012-06-06 13:07:05 +01:00

..

Perlin.cs

remove some mono compiler warnings

2011-01-21 23:19:52 +00:00

TerrainSplat.cs

Actively dispose of Bitmaps in Warp3D image module and world map module once we've finished with them.

2012-06-06 04:11:16 +01:00

Viewport.cs

Addign the new / renamed files for previous commit

2010-10-03 16:34:55 +01:00

Warp3DImageModule.cs

Merge branch 'master' into careminster

2012-06-06 13:07:05 +01:00