diff options
author | dahlia | 2013-05-24 01:54:28 -0700 |
---|---|---|
committer | dahlia | 2013-05-24 01:54:28 -0700 |
commit | 21a3a81c7ab3ebae0a0ffe987a4c08b0c51e4127 (patch) | |
tree | 0490bdfefa34e7daba7b8bdca3a60cc716937ba3 /OpenSim/Region | |
parent | correct some errors in decoding of mesh asset convex decomposition data (diff) | |
parent | minor: Remove unnecessary duplication of AbsolutePosition Vector3 in SOG.Copy() (diff) | |
download | opensim-SC-21a3a81c7ab3ebae0a0ffe987a4c08b0c51e4127.zip opensim-SC-21a3a81c7ab3ebae0a0ffe987a4c08b0c51e4127.tar.gz opensim-SC-21a3a81c7ab3ebae0a0ffe987a4c08b0c51e4127.tar.bz2 opensim-SC-21a3a81c7ab3ebae0a0ffe987a4c08b0c51e4127.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 2d4218d..df23cc5 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -1499,7 +1499,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1499 | if (!userExposed) | 1499 | if (!userExposed) |
1500 | dupe.IsAttachment = true; | 1500 | dupe.IsAttachment = true; |
1501 | 1501 | ||
1502 | dupe.AbsolutePosition = new Vector3(AbsolutePosition.X, AbsolutePosition.Y, AbsolutePosition.Z); | ||
1503 | dupe.m_sittingAvatars = new List<UUID>(); | 1502 | dupe.m_sittingAvatars = new List<UUID>(); |
1504 | 1503 | ||
1505 | if (!userExposed) | 1504 | if (!userExposed) |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index b1c1cbb..ea8c3c5 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -1799,6 +1799,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1799 | Array.Copy(Shape.ExtraParams, extraP, extraP.Length); | 1799 | Array.Copy(Shape.ExtraParams, extraP, extraP.Length); |
1800 | dupe.Shape.ExtraParams = extraP; | 1800 | dupe.Shape.ExtraParams = extraP; |
1801 | 1801 | ||
1802 | dupe.PayPrice = (int[])PayPrice.Clone(); | ||
1803 | |||
1802 | dupe.DynAttrs.CopyFrom(DynAttrs); | 1804 | dupe.DynAttrs.CopyFrom(DynAttrs); |
1803 | 1805 | ||
1804 | if (userExposed) | 1806 | if (userExposed) |