From 1bf60fa1ace0bd6c1e10801d74956f84b2d6afd7 Mon Sep 17 00:00:00 2001
From: Dahlia Trimble
Date: Thu, 14 Aug 2008 08:59:13 +0000
Subject: updated some prim parameters to project maintained versions

---
 OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/Physics/Meshing/Meshmerizer.cs')

diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 984114b..f041aec 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -30,7 +30,6 @@ using System;
 using System.Collections.Generic;
 using OpenSim.Framework;
 using OpenSim.Region.Physics.Manager;
-using libsecondlife;
 
 namespace OpenSim.Region.Physics.Meshing
 {
@@ -1883,12 +1882,12 @@ namespace OpenSim.Region.Physics.Meshing
             }
             else if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.Square)
             {
-                if (primShape.PathCurve == (byte)LLObject.PathCurve.Line)
+                if (primShape.PathCurve == (byte)Extrusion.Straight)
                 { // its a box
                     mesh = CreateBoxMesh(primName, primShape, size);
                     CalcNormals(mesh);
                 }
-                else if (primShape.PathCurve == (byte)LLObject.PathCurve.Circle)
+                else if (primShape.PathCurve == (byte)Extrusion.Curve1)
                 { // tube
                     // do a cylinder for now
                     //mesh = CreateCylinderMesh(primName, primShape, size);
@@ -1904,9 +1903,8 @@ namespace OpenSim.Region.Physics.Meshing
                     CalcNormals(mesh);
                 }
 
-                // look at LLObject.cs in libsecondlife for how to know the prim type
                 // ProfileCurve seems to combine hole shape and profile curve so we need to only compare against the lower 3 bits
-                else if (primShape.PathCurve == (byte) Extrusion.Curve1 && LLObject.UnpackPathScale(primShape.PathScaleY) <= 0.75f)
+                else if (primShape.PathCurve == (byte) Extrusion.Curve1)
                 {  // dahlia's favorite, a torus :)
                     mesh = CreateCircularPathMesh(primName, primShape, size);
                     CalcNormals(mesh);
-- 
cgit v1.1