From c644ab6a2c902c829a0dc88d08780a4411b4cd29 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 14 Apr 2011 20:21:44 +0100
Subject: Make scene object parts created by the test utils unit sized.
---
.../Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs | 4 +---
OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 4 ++--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
index 9fc77a7..60a932d 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
@@ -89,11 +89,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
// Create asset
SceneObjectGroup object1 = SceneSetupHelpers.CreateSceneObject(1, m_userId, "Object1", 0x20);
object1.AbsolutePosition = new Vector3(15, 30, 45);
- object1.Parts[0].Scale = new Vector3(1, 1, 1);
SceneObjectGroup object2 = SceneSetupHelpers.CreateSceneObject(1, m_userId, "Object2", 0x40);
- object2.AbsolutePosition = new Vector3(25, 50, 75);
- object2.Parts[0].Scale = new Vector3(1, 1, 1);
+ object2.AbsolutePosition = new Vector3(25, 50, 75);
CoalescedSceneObjects coa = new CoalescedSceneObjects(m_userId, object1, object2);
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 709dd78..eb08b62 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -472,10 +472,10 @@ namespace OpenSim.Tests.Common.Setup
///
///
public static SceneObjectPart CreateSceneObjectPart(string name, UUID id, UUID ownerId)
- {
+ {
return new SceneObjectPart(
ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
- { Name = name, UUID = id };
+ { Name = name, UUID = id, Scale = new Vector3(1, 1, 1) };
}
///
--
cgit v1.1