Merge branch 'master' into careminster

Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
author: Melanie 2013-05-24 01:11:49 +0100
committer: Melanie 2013-05-24 01:11:49 +0100
commit: e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f (patch)
tree: 1c9b02e48835c85a84b85d690428bf65adfe7fd9 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parent: Merge branch 'master' into careminster (diff)
parent: minor: Remove unnecessary duplication of AbsolutePosition Vector3 in SOG.Copy() (diff)
download: opensim-SC_OLD-e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f.zip
opensim-SC_OLD-e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f.tar.gz
opensim-SC_OLD-e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f.tar.bz2
opensim-SC_OLD-e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f.tar.xz
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 2b5a6f9..8c6450d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2159,6 +2159,7 @@ namespace OpenSim.Region.Framework.Scenes
            // safeguard  actual copy is done in sog.copy
            dupe.KeyframeMotion = null;
+            dupe.PayPrice = (int[])PayPrice.Clone();
            dupe.DynAttrs.CopyFrom(DynAttrs);
author	Melanie	2013-05-24 01:11:49 +0100
committer	Melanie	2013-05-24 01:11:49 +0100
commit	e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f (patch)
tree	1c9b02e48835c85a84b85d690428bf65adfe7fd9 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parent	Merge branch 'master' into careminster (diff)
parent	minor: Remove unnecessary duplication of AbsolutePosition Vector3 in SOG.Copy() (diff)
download	opensim-SC_OLD-e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f.zip opensim-SC_OLD-e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f.tar.gz opensim-SC_OLD-e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f.tar.bz2 opensim-SC_OLD-e2e839a0cd4035ffacfcdc601dfc534a05bc4e0f.tar.xz

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 2b5a6f9..8c6450d 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2159,6 +2159,7 @@ namespace OpenSim.Region.Framework.Scenes
2159		2159
2160	// safeguard actual copy is done in sog.copy	2160	// safeguard actual copy is done in sog.copy
2161	dupe.KeyframeMotion = null;	2161	dupe.KeyframeMotion = null;
		2162	dupe.PayPrice = (int[])PayPrice.Clone();
2162		2163
2163	dupe.DynAttrs.CopyFrom(DynAttrs);	2164	dupe.DynAttrs.CopyFrom(DynAttrs);
2164		2165