diff options
| author | Snowcrash | 2009-10-22 15:48:21 +0200 |
|---|---|---|
| committer | Melanie | 2009-10-22 17:36:52 +0100 |
| commit | 84ac0f56f5c6a52f975efa125e9128d559d47d0e (patch) | |
| tree | e1f9759a2207095b0275c4728f6e6fff1830579c | |
| parent | Fix rounding error in PRIM_SIZE portion of llSetPrimitiveParams (diff) | |
| download | opensim-SC-84ac0f56f5c6a52f975efa125e9128d559d47d0e.zip opensim-SC-84ac0f56f5c6a52f975efa125e9128d559d47d0e.tar.gz opensim-SC-84ac0f56f5c6a52f975efa125e9128d559d47d0e.tar.bz2 opensim-SC-84ac0f56f5c6a52f975efa125e9128d559d47d0e.tar.xz | |
Fixing the patch to the patch
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index c3e89f6..435b6e3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -1265,9 +1265,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 1265 | // TODO: this needs to trigger a persistance save as well | 1265 | // TODO: this needs to trigger a persistance save as well |
| 1266 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) | 1266 | if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) |
| 1267 | return; | 1267 | return; |
| 1268 | // scale.x < 0.01 in a manner which handles rounding errors | 1268 | if (scale.x < 0.01) |
| 1269 | 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) | 1269 | scale.x = 0.01; |
| 1270 | return; | 1270 | if (scale.y < 0.01) |
| 1271 | scale.y = 0.01; | ||
| 1272 | if (scale.z < 0.01) | ||
| 1273 | scale.z = 0.01; | ||
| 1271 | 1274 | ||
| 1272 | if (part.ParentGroup.RootPart.PhysActor != null && part.ParentGroup.RootPart.PhysActor.IsPhysical) | 1275 | if (part.ParentGroup.RootPart.PhysActor != null && part.ParentGroup.RootPart.PhysActor.IsPhysical) |
| 1273 | { | 1276 | { |