aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs4
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs2
-rw-r--r--OpenSim/Region/Physics/Meshing/PrimMesher.cs3
3 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
index 8d9c8b2..148e03f 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
@@ -38,8 +38,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
38{ 38{
39 public class LLPacketServer 39 public class LLPacketServer
40 { 40 {
41 private static readonly log4net.ILog m_log 41// private static readonly log4net.ILog m_log
42 = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 42// = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
43 43
44 protected readonly ILLClientStackNetworkHandler m_networkHandler; 44 protected readonly ILLClientStackNetworkHandler m_networkHandler;
45 protected IScene m_scene; 45 protected IScene m_scene;
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
index 819e4e8..620e33f 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
74 74
75 uint port = 666; 75 uint port = 666;
76 testLLUDPServer.Initialise(null, ref port, 0, false, userSettings, null, acm); 76 testLLUDPServer.Initialise(null, ref port, 0, false, userSettings, null, acm);
77 LLPacketServer packetServer = new LLPacketServer(testLLUDPServer, userSettings); 77 new LLPacketServer(testLLUDPServer, userSettings);
78 testLLUDPServer.LocalScene = new MockScene(); 78 testLLUDPServer.LocalScene = new MockScene();
79 79
80 UseCircuitCodePacket uccp = new UseCircuitCodePacket(); 80 UseCircuitCodePacket uccp = new UseCircuitCodePacket();
diff --git a/OpenSim/Region/Physics/Meshing/PrimMesher.cs b/OpenSim/Region/Physics/Meshing/PrimMesher.cs
index 2a019ca..bec1495 100644
--- a/OpenSim/Region/Physics/Meshing/PrimMesher.cs
+++ b/OpenSim/Region/Physics/Meshing/PrimMesher.cs
@@ -976,7 +976,7 @@ namespace PrimMesher
976 this.faceNormal.Y = -this.faceNormal.Y; 976 this.faceNormal.Y = -this.faceNormal.Y;
977 this.faceNormal.Z = -this.faceNormal.Z; 977 this.faceNormal.Z = -this.faceNormal.Z;
978 978
979 int numUs = this.us.Count; 979 //int numUs = this.us.Count;
980 //for (int i = 0; i < numUs; i++) 980 //for (int i = 0; i < numUs; i++)
981 // this.us[i] 981 // this.us[i]
982 982
@@ -1928,7 +1928,6 @@ namespace PrimMesher
1928 1928
1929 public Coord SurfaceNormal(int faceIndex) 1929 public Coord SurfaceNormal(int faceIndex)
1930 { 1930 {
1931 int numFaces = faces.Count;
1932 if (faceIndex < 0 || faceIndex >= faces.Count) 1931 if (faceIndex < 0 || faceIndex >= faces.Count)
1933 throw new Exception("faceIndex out of range"); 1932 throw new Exception("faceIndex out of range");
1934 1933