aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs2
-rw-r--r--OpenSim/Region/Physics/Meshing/PrimMesher.cs8
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 499b2f8..315ff3c 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -153,7 +153,7 @@ namespace OpenSim.Framework.Servers
153 { 153 {
154 sb.Append("ID: " + t.ManagedThreadId + ", Name: " + t.Name + ", DEAD" + Environment.NewLine); 154 sb.Append("ID: " + t.ManagedThreadId + ", Name: " + t.Name + ", DEAD" + Environment.NewLine);
155 } 155 }
156 catch (Exception e) 156 catch
157 { 157 {
158 sb.Append("THREAD ERROR" + Environment.NewLine); 158 sb.Append("THREAD ERROR" + Environment.NewLine);
159 } 159 }
diff --git a/OpenSim/Region/Physics/Meshing/PrimMesher.cs b/OpenSim/Region/Physics/Meshing/PrimMesher.cs
index 55b8b1b..7245eea 100644
--- a/OpenSim/Region/Physics/Meshing/PrimMesher.cs
+++ b/OpenSim/Region/Physics/Meshing/PrimMesher.cs
@@ -1213,7 +1213,7 @@ namespace PrimMesher
1213 1213
1214 1214
1215 Coord lastCutNormal1 = new Coord(); 1215 Coord lastCutNormal1 = new Coord();
1216 Coord lastCutNormal2 = new Coord(); 1216 //Coord lastCutNormal2 = new Coord();
1217 float lastV = 1.0f; 1217 float lastV = 1.0f;
1218 1218
1219 bool done = false; 1219 bool done = false;
@@ -1424,7 +1424,7 @@ namespace PrimMesher
1424 } 1424 }
1425 1425
1426 lastCutNormal1 = newLayer.cutNormal1; 1426 lastCutNormal1 = newLayer.cutNormal1;
1427 lastCutNormal2 = newLayer.cutNormal2; 1427 //lastCutNormal2 = newLayer.cutNormal2;
1428 lastV = 1.0f - percentOfPath; 1428 lastV = 1.0f - percentOfPath;
1429 1429
1430 // calc the step for the next iteration of the loop 1430 // calc the step for the next iteration of the loop
@@ -1578,7 +1578,7 @@ namespace PrimMesher
1578 } 1578 }
1579 1579
1580 Coord lastCutNormal1 = new Coord(); 1580 Coord lastCutNormal1 = new Coord();
1581 Coord lastCutNormal2 = new Coord(); 1581 //Coord lastCutNormal2 = new Coord();
1582 float lastV = 1.0f; 1582 float lastV = 1.0f;
1583 1583
1584 bool done = false; 1584 bool done = false;
@@ -1781,7 +1781,7 @@ namespace PrimMesher
1781 } 1781 }
1782 1782
1783 lastCutNormal1 = newLayer.cutNormal1; 1783 lastCutNormal1 = newLayer.cutNormal1;
1784 lastCutNormal2 = newLayer.cutNormal2; 1784 //lastCutNormal2 = newLayer.cutNormal2;
1785 lastV = 1.0f - percentOfPath; 1785 lastV = 1.0f - percentOfPath;
1786 1786
1787 // calculate terms for next iteration 1787 // calculate terms for next iteration