aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs6
2 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index e84ab05..53b4f7e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4255,7 +4255,8 @@ namespace OpenSim.Region.Framework.Scenes
4255 ushort uBegin = (ushort)(50000.0 * begin); 4255 ushort uBegin = (ushort)(50000.0 * begin);
4256 ushort uEnd = (ushort)(50000.0 * (1f - end)); 4256 ushort uEnd = (ushort)(50000.0 * (1f - end));
4257 bool updatePossiblyNeeded = false; 4257 bool updatePossiblyNeeded = false;
4258 if (GetPrimType() == PrimType.SPHERE) 4258 PrimType primType = GetPrimType();
4259 if (primType == PrimType.SPHERE || primType == PrimType.TORUS || primType == PrimType.TUBE || primType == PrimType.RING)
4259 { 4260 {
4260 if (m_shape.ProfileBegin != uBegin || m_shape.ProfileEnd != uEnd) 4261 if (m_shape.ProfileBegin != uBegin || m_shape.ProfileEnd != uEnd)
4261 { 4262 {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 75491da..31d1660 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8347,9 +8347,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8347 res.Add(new LSL_Vector(GetPartLocalPos(part))); 8347 res.Add(new LSL_Vector(GetPartLocalPos(part)));
8348 break; 8348 break;
8349 case (int)ScriptBaseClass.PRIM_SLICE: 8349 case (int)ScriptBaseClass.PRIM_SLICE:
8350 PrimType prim_type = part.GetPrimType();
8351 bool useProfileBeginEnd = (prim_type == PrimType.SPHERE || prim_type == PrimType.TORUS || prim_type == PrimType.TUBE || prim_type == PrimType.RING);
8350 res.Add(new LSL_Vector( 8352 res.Add(new LSL_Vector(
8351 (part.GetPrimType() == PrimType.SPHERE ? part.Shape.ProfileBegin : part.Shape.PathBegin) / 50000.0, 8353 (useProfileBeginEnd ? part.Shape.ProfileBegin : part.Shape.PathBegin) / 50000.0,
8352 1 - (part.GetPrimType() == PrimType.SPHERE ? part.Shape.ProfileEnd : part.Shape.PathEnd) / 50000.0, 8354 1 - (useProfileBeginEnd ? part.Shape.ProfileEnd : part.Shape.PathEnd) / 50000.0,
8353 0 8355 0
8354 )); 8356 ));
8355 break; 8357 break;