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

Conflicts:
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2013-01-04 22:39:07 +00:00

..

Effects

move ChannelDigger from its own project into the main terrain module with the rest of the effects

2010-07-30 20:34:14 +01:00

FileLoaders

Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than constructing fresh copies.

2012-07-11 22:54:22 +01:00

FloodBrushes

Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.

2009-06-01 06:37:14 +00:00

PaintBrushes

Thanks Michelle Argus for Mantis #0003742: Terrain editor - Flatten tool lowers Land

2009-06-18 23:02:12 +00:00

Tests

Consistenly make NUnit test cases inherit from OpenSimTestCase which automatically turns off any logging enabled between tests

2012-11-24 03:15:24 +00:00

ITerrainFloodEffect.cs

Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.

2009-06-01 06:37:14 +00:00

ITerrainLoader.cs

terrain save-tile extensions Signed-off-by: Garmin Kawaguichi <garmin.kawaguichi@magalaxie.com>

2012-04-03 20:06:03 +01:00

ITerrainPaintableEffect.cs

Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.

2009-06-01 06:37:14 +00:00

TerrainException.cs

Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.

2009-06-01 06:37:14 +00:00

TerrainModule.cs

Merge branch 'master' into careminster

2013-01-04 22:39:07 +00:00