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

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs

2012-07-12 08:55:16 +01: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

* Remove hard coded 256 limitations from various places. There's no more 256m limitation within the OpenSimulator framework, however, the LLClient ClientView does not support regions larger then 256 meters so, if you try and make your region larger by setting Constants.RegionSize = 512; in OpenSim.Framework.Constants.cs, the terrain will not display on clients using the LLUDP protocol

2009-08-07 18:40:56 -04: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

2012-07-05 22:17:39 +01:00