ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Push all part resize code down into SceneObjectPart.Resize()

Browse Source
This commit is contained in:
Justin Clark-Casey (justincc)
2011-07-16 04:22:57 +01:00
parent 4b5a6b655b
commit 2b68ac4ba3
4 changed files with 32 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2846,6 +2846,13 @@ namespace OpenSim.Region.Framework.Scenes
/// <param name="scale"></param>
public void Resize(Vector3 scale)
{
if (scale.X > ParentGroup.Scene.m_maxNonphys)
scale.X = ParentGroup.Scene.m_maxNonphys;
if (scale.Y > ParentGroup.Scene.m_maxNonphys)
scale.Y = ParentGroup.Scene.m_maxNonphys;
if (scale.Z > ParentGroup.Scene.m_maxNonphys)
scale.Z = ParentGroup.Scene.m_maxNonphys;
// m_log.DebugFormat("[SCENE OBJECT PART]: Resizing {0} {1} to {2}", Name, LocalId, scale);
StoreUndoState();
@@ -2855,9 +2862,27 @@ namespace OpenSim.Region.Framework.Scenes
// need to reinsert the sculpt data into the shape, since the physics engine deletes it when done to
// save memory
if (PhysActor != null)
CheckSculptAndLoad();
{
if (PhysActor.IsPhysical)
{
if (scale.X > ParentGroup.Scene.m_maxPhys)
scale.X = ParentGroup.Scene.m_maxPhys;
if (scale.Y > ParentGroup.Scene.m_maxPhys)
scale.Y = ParentGroup.Scene.m_maxPhys;
if (scale.Z > ParentGroup.Scene.m_maxPhys)
scale.Z = ParentGroup.Scene.m_maxPhys;
}
PhysActor.Size = scale;
if (((OpenMetaverse.SculptType)Shape.SculptType) == SculptType.Mesh)
CheckSculptAndLoad();
else
ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor);
}
ParentGroup.HasGroupChanged = true;
TriggerScriptChangedEvent(Changed.SCALE);
ScheduleFullUpdate();
}