Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
This commit is contained in:
Melanie
2012-11-25 14:13:50 +00:00
89 changed files with 974 additions and 644 deletions

View File

@@ -41,7 +41,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
/// Basic scene object resize tests
/// </summary>
[TestFixture]
public class SceneObjectResizeTests
public class SceneObjectResizeTests : OpenSimTestCase
{
/// <summary>
/// Test resizing an object