diff options
author | Justin Clark-Casey (justincc) | 2011-04-14 20:21:44 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-04-14 20:21:44 +0100 |
commit | c644ab6a2c902c829a0dc88d08780a4411b4cd29 (patch) | |
tree | c19ce1d991ea1c154e19239e2d96dc1aa7d67d93 /OpenSim | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-c644ab6a2c902c829a0dc88d08780a4411b4cd29.zip opensim-SC-c644ab6a2c902c829a0dc88d08780a4411b4cd29.tar.gz opensim-SC-c644ab6a2c902c829a0dc88d08780a4411b4cd29.tar.bz2 opensim-SC-c644ab6a2c902c829a0dc88d08780a4411b4cd29.tar.xz |
Make scene object parts created by the test utils unit sized.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs | 4 | ||||
-rw-r--r-- | 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 | |||
89 | // Create asset | 89 | // Create asset |
90 | SceneObjectGroup object1 = SceneSetupHelpers.CreateSceneObject(1, m_userId, "Object1", 0x20); | 90 | SceneObjectGroup object1 = SceneSetupHelpers.CreateSceneObject(1, m_userId, "Object1", 0x20); |
91 | object1.AbsolutePosition = new Vector3(15, 30, 45); | 91 | object1.AbsolutePosition = new Vector3(15, 30, 45); |
92 | object1.Parts[0].Scale = new Vector3(1, 1, 1); | ||
93 | 92 | ||
94 | SceneObjectGroup object2 = SceneSetupHelpers.CreateSceneObject(1, m_userId, "Object2", 0x40); | 93 | SceneObjectGroup object2 = SceneSetupHelpers.CreateSceneObject(1, m_userId, "Object2", 0x40); |
95 | object2.AbsolutePosition = new Vector3(25, 50, 75); | 94 | object2.AbsolutePosition = new Vector3(25, 50, 75); |
96 | object2.Parts[0].Scale = new Vector3(1, 1, 1); | ||
97 | 95 | ||
98 | CoalescedSceneObjects coa = new CoalescedSceneObjects(m_userId, object1, object2); | 96 | CoalescedSceneObjects coa = new CoalescedSceneObjects(m_userId, object1, object2); |
99 | 97 | ||
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 | |||
472 | /// <param name="ownerId"></param> | 472 | /// <param name="ownerId"></param> |
473 | /// <returns></returns> | 473 | /// <returns></returns> |
474 | public static SceneObjectPart CreateSceneObjectPart(string name, UUID id, UUID ownerId) | 474 | public static SceneObjectPart CreateSceneObjectPart(string name, UUID id, UUID ownerId) |
475 | { | 475 | { |
476 | return new SceneObjectPart( | 476 | return new SceneObjectPart( |
477 | ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) | 477 | ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) |
478 | { Name = name, UUID = id }; | 478 | { Name = name, UUID = id, Scale = new Vector3(1, 1, 1) }; |
479 | } | 479 | } |
480 | 480 | ||
481 | /// <summary> | 481 | /// <summary> |