diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index e58f5e881c..f43e12669f 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs @@ -374,7 +374,8 @@ namespace OpenSim.Region.Framework.Scenes if (scale.Z > m_parentScene.m_maxNonphys) scale.Z = m_parentScene.m_maxNonphys; - part.Shape.Scale = scale; + //part.Shape.Scale = scale; + part.Scale = scale; } } m_numPrim += children.Length; @@ -2053,7 +2054,8 @@ namespace OpenSim.Region.Framework.Scenes { foreach (SceneObjectPart part in children) { - Vector3 scale = part.Shape.Scale; + SceneObjectPartBase partBase = (SceneObjectPartBase)part; + Vector3 scale = partBase.Scale; if (scale.X > m_parentScene.m_maxNonphys) scale.X = m_parentScene.m_maxNonphys; @@ -2062,7 +2064,7 @@ namespace OpenSim.Region.Framework.Scenes if (scale.Z > m_parentScene.m_maxNonphys) scale.Z = m_parentScene.m_maxNonphys; - part.Shape.Scale = scale; + part.Scale = scale; } } m_numPrim += children.Length; diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index ba64878cbb..ffbb7d0100 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -5397,6 +5397,18 @@ namespace OpenSim.Region.Framework.Scenes } } + new public Vector3 OffsetPosition + { + get { return base.OffsetPosition; } + set + { + base.OffsetPosition = value; + UpdateBucketSyncInfo("OffsetPosition"); + } + } + + + new public PrimitiveBaseShape Shape { get { return base.Shape; } @@ -5439,6 +5451,12 @@ namespace OpenSim.Region.Framework.Scenes UpdateBucketSyncInfo("Shape"); } + public override void Resize(Vector3 scale) + { + base.Resize(scale); + UpdateBucketSyncInfo("Scale"); + } + #endregion //new property access functions