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

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

2013-01-11 02:13:10 +00:00

..

EstateManagementCommands.cs

enabling all corners of a sim to be set in one call

2012-06-06 02:47:47 +01:00

EstateManagementModule.cs

Merge branch 'master' into careminster

2013-01-11 02:13:10 +00:00

EstateTerrainXferHandler.cs

Changed asset CreatorID to a string

2010-02-22 14:18:59 -08:00

TelehubManager.cs

Simplify and streamline telehub editing code. Verify rotations and fix

2012-01-24 02:36:35 +00:00