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

Fix rounding error in PRIM_SIZE portion of llSetPrimitiveParams

0.6.8-post-fixes
Snowcrash 2009-10-20 15:51:19 +02:00 committed by Melanie
parent 6ca4b0f366
commit 47d8b6c5f5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -1263,11 +1263,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
protected void SetScale(SceneObjectPart part, LSL_Vector scale) protected void SetScale(SceneObjectPart part, LSL_Vector scale)
{ {
// TODO: this needs to trigger a persistance save as well // TODO: this needs to trigger a persistance save as well
if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
return; return;
// scale.x < 0.01 in a manner which handles rounding errors
if (scale.x < 0.01 || scale.y < 0.01 || scale.z < 0.01) if (Math.Round(scale.x - 0.01) > 0.0 || Math.Round(scale.y - 0.01) > 0.0 || Math.Round(scale.z - 0.01) > 0.0)
return; return;
if (part.ParentGroup.RootPart.PhysActor != null && part.ParentGroup.RootPart.PhysActor.IsPhysical) if (part.ParentGroup.RootPart.PhysActor != null && part.ParentGroup.RootPart.PhysActor.IsPhysical)
@ -1279,12 +1278,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (scale.z > World.m_maxPhys) if (scale.z > World.m_maxPhys)
scale.z = World.m_maxPhys; scale.z = World.m_maxPhys;
} }
if (scale.x > World.m_maxNonphys) if (scale.x > World.m_maxNonphys)
scale.x = World.m_maxNonphys; scale.x = World.m_maxNonphys;
if (scale.y > World.m_maxNonphys) if (scale.y > World.m_maxNonphys)
scale.y = World.m_maxNonphys; scale.y = World.m_maxNonphys;
if (scale.z > World.m_maxNonphys) if (scale.z > World.m_maxNonphys)
scale.z = World.m_maxNonphys; scale.z = World.m_maxNonphys;
Vector3 tmp = part.Scale; Vector3 tmp = part.Scale;
tmp.X = (float)scale.x; tmp.X = (float)scale.x;
tmp.Y = (float)scale.y; tmp.Y = (float)scale.y;