Melanie 54fc78013d Merge branch 'master' into careminster ...

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

2012-02-05 20:58:04 +00:00

..

Tests

rename TestHelper => TestHelpers for consistency

2011-08-06 00:31:03 +01:00

LandChannel.cs

remove now unused individual LandData prim counts.

2011-04-05 21:25:54 +01:00

LandManagementModule.cs

Revert "Check ban list for a particular parcel only when an avatar moves into it."

2012-02-05 20:12:35 +00:00

LandObject.cs

Merge branch 'master' into careminster

2012-02-05 20:58:04 +00:00

PrimCountModule.cs

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00