OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Access to sop.Shape.Scale replaced by sop.Scale.

dsg
Huaiyu (Kitty) Liu 2011-02-10 17:06:15 -08:00
parent 88e42011af
commit 5ef659520e
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@ -374,7 +374,8 @@ namespace OpenSim.Region.Framework.Scenes
if (scale.Z > m_parentScene.m_maxNonphys) if (scale.Z > m_parentScene.m_maxNonphys)
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; m_numPrim += children.Length;
@ -2053,7 +2054,8 @@ namespace OpenSim.Region.Framework.Scenes
{ {
foreach (SceneObjectPart part in children) 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) if (scale.X > m_parentScene.m_maxNonphys)
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) if (scale.Z > m_parentScene.m_maxNonphys)
scale.Z = m_parentScene.m_maxNonphys; scale.Z = m_parentScene.m_maxNonphys;
part.Shape.Scale = scale; part.Scale = scale;
} }
} }
m_numPrim += children.Length; m_numPrim += children.Length;

18
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -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 new public PrimitiveBaseShape Shape
{ {
get { return base.Shape; } get { return base.Shape; }
@ -5439,6 +5451,12 @@ namespace OpenSim.Region.Framework.Scenes
UpdateBucketSyncInfo("Shape"); UpdateBucketSyncInfo("Shape");
} }
public override void Resize(Vector3 scale)
{
base.Resize(scale);
UpdateBucketSyncInfo("Scale");
}
#endregion //new property access functions #endregion //new property access functions