diff options
author | Melanie | 2010-10-05 02:12:35 +0100 |
---|---|---|
committer | Melanie | 2010-10-05 02:12:35 +0100 |
commit | ba0a19c228b8d9bce0a9fc2328e69ba48befab66 (patch) | |
tree | d20a2049e2b4f49908f60e21988cd6b0bfc02aaa /OpenSim/Region/Framework | |
parent | Make windlight set the default environment on start (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC_OLD-ba0a19c228b8d9bce0a9fc2328e69ba48befab66.zip opensim-SC_OLD-ba0a19c228b8d9bce0a9fc2328e69ba48befab66.tar.gz opensim-SC_OLD-ba0a19c228b8d9bce0a9fc2328e69ba48befab66.tar.bz2 opensim-SC_OLD-ba0a19c228b8d9bce0a9fc2328e69ba48befab66.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index a8e76e3..8140d42 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2763,7 +2763,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2763 | UUID = UUID.Random(); | 2763 | UUID = UUID.Random(); |
2764 | LinkNum = linkNum; | 2764 | LinkNum = linkNum; |
2765 | LocalId = 0; | 2765 | LocalId = 0; |
2766 | Inventory.ResetInventoryIDs(); | 2766 | Inventory.ResetInventoryIDs(); |
2767 | } | 2767 | } |
2768 | 2768 | ||
2769 | /// <summary> | 2769 | /// <summary> |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index a4533fa..13d9964 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1523,7 +1523,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1523 | } | 1523 | } |
1524 | 1524 | ||
1525 | // If the agent update does move the avatar, then calculate the force ready for the velocity update, | 1525 | // If the agent update does move the avatar, then calculate the force ready for the velocity update, |
1526 | // which occurs later in the main scene loop | 1526 | // which occurs later in the main scene loop |
1527 | if (update_movementflag || (update_rotation && DCFlagKeyPressed)) | 1527 | if (update_movementflag || (update_rotation && DCFlagKeyPressed)) |
1528 | { | 1528 | { |
1529 | // m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed)); | 1529 | // m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed)); |
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 | } |