Melanie 74aa8eee12 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2012-04-17 01:54:54 +01:00

..

EstateManagementCommands.cs

Uses shorter AddCommand form for "show estates"

2012-03-08 02:23:52 +00:00

EstateManagementModule.cs

Merge branch 'master' into careminster

2012-04-17 01:54:54 +01: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