diff options
author | Jonathan Freedman | 2010-10-05 14:17:18 -0400 |
---|---|---|
committer | Jonathan Freedman | 2010-10-05 14:17:18 -0400 |
commit | 8f1acb890ac49ea004bf43065ce8d3472bb27708 (patch) | |
tree | 07e4e5fc77f764232c958bdbf8f93f2651da1663 /OpenSim/Region/Framework/Scenes/Tests | |
parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.zip opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.gz opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.bz2 opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.xz |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs index e6ff0c0..5616a4e 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs | |||
@@ -210,7 +210,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
210 | = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) | 210 | = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) |
211 | { Name = childPartName, UUID = childPartUuid }; | 211 | { Name = childPartName, UUID = childPartUuid }; |
212 | 212 | ||
213 | SceneObjectGroup sog = new SceneObjectGroup(rootPart); | 213 | SceneObjectGroup sog = new SceneObjectGroup(rootPart); |
214 | sog.AddPart(linkPart); | 214 | sog.AddPart(linkPart); |
215 | 215 | ||
216 | Assert.That(sog.UUID, Is.EqualTo(rootPartUuid)); | 216 | Assert.That(sog.UUID, Is.EqualTo(rootPartUuid)); |
@@ -221,7 +221,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
221 | sog.UUID = newRootPartUuid; | 221 | sog.UUID = newRootPartUuid; |
222 | 222 | ||
223 | Assert.That(sog.UUID, Is.EqualTo(newRootPartUuid)); | 223 | Assert.That(sog.UUID, Is.EqualTo(newRootPartUuid)); |
224 | Assert.That(sog.RootPart.UUID, Is.EqualTo(newRootPartUuid)); | 224 | Assert.That(sog.RootPart.UUID, Is.EqualTo(newRootPartUuid)); |
225 | Assert.That(sog.Parts.Length, Is.EqualTo(2)); | 225 | Assert.That(sog.Parts.Length, Is.EqualTo(2)); |
226 | } | 226 | } |
227 | } | 227 | } |