aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api
diff options
context:
space:
mode:
authorMelanie2009-11-23 04:24:58 +0000
committerMelanie2009-11-23 04:24:58 +0000
commitdf121a7cd065cc067818f6a39a44ddaaab647fec (patch)
tree5cc0e157ff3aefad066c07a1ebea2ae4b1ebdbe4 /OpenSim/Region/ScriptEngine/Shared/Api
parentMerge branch 'master' into careminster (diff)
parent* Adds a modicum of additional checking to the Inventory Service (MySQL only) (diff)
downloadopensim-SC-df121a7cd065cc067818f6a39a44ddaaab647fec.zip
opensim-SC-df121a7cd065cc067818f6a39a44ddaaab647fec.tar.gz
opensim-SC-df121a7cd065cc067818f6a39a44ddaaab647fec.tar.bz2
opensim-SC-df121a7cd065cc067818f6a39a44ddaaab647fec.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs6
1 files changed, 3 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 5fb2775..50b2fb5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1271,11 +1271,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1271 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) 1271 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1272 return; 1272 return;
1273 if (scale.x < 0.01) 1273 if (scale.x < 0.01)
1274 scale.x = 0.01; 1274 scale.x = 0.01;
1275 if (scale.y < 0.01) 1275 if (scale.y < 0.01)
1276 scale.y = 0.01; 1276 scale.y = 0.01;
1277 if (scale.z < 0.01) 1277 if (scale.z < 0.01)
1278 scale.z = 0.01; 1278 scale.z = 0.01;
1279 1279
1280 if (part.ParentGroup.RootPart.PhysActor != null && part.ParentGroup.RootPart.PhysActor.IsPhysical) 1280 if (part.ParentGroup.RootPart.PhysActor != null && part.ParentGroup.RootPart.PhysActor.IsPhysical)
1281 { 1281 {