diff options
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Meshing/PrimMesher.cs | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs index b5f065d..91fadba 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs | |||
@@ -53,7 +53,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
53 | ChunkSenderTuple tuple = m_chunksToLoad.Dequeue(); | 53 | ChunkSenderTuple tuple = m_chunksToLoad.Dequeue(); |
54 | reusedEpSender = tuple.Sender; | 54 | reusedEpSender = tuple.Sender; |
55 | throw new SocketException(); | 55 | throw new SocketException(); |
56 | ReceiveData(null); | ||
57 | } | 56 | } |
58 | } | 57 | } |
59 | 58 | ||
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs index dd0ca8c..3576594 100644 --- a/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs +++ b/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs | |||
@@ -73,6 +73,9 @@ namespace OpenSim.Region.Environment.Scenes.Tests | |||
73 | = new Scene(regInfo, acm, cm, scs, null, sm, null, null, false, false, false, configSource, null); | 73 | = new Scene(regInfo, acm, cm, scs, null, sm, null, null, false, false, false, configSource, null); |
74 | 74 | ||
75 | SceneObjectGroup sceneObject = new SceneObjectGroup(); | 75 | SceneObjectGroup sceneObject = new SceneObjectGroup(); |
76 | SceneObjectPart part = new SceneObjectPart(); | ||
77 | sceneObject.AddPart(part); | ||
78 | |||
76 | scene.AddNewSceneObject(sceneObject, false); | 79 | scene.AddNewSceneObject(sceneObject, false); |
77 | } | 80 | } |
78 | } | 81 | } |
diff --git a/OpenSim/Region/Physics/Meshing/PrimMesher.cs b/OpenSim/Region/Physics/Meshing/PrimMesher.cs index 72da5cf..282bbd5 100644 --- a/OpenSim/Region/Physics/Meshing/PrimMesher.cs +++ b/OpenSim/Region/Physics/Meshing/PrimMesher.cs | |||
@@ -689,7 +689,7 @@ namespace PrimMesher | |||
689 | 689 | ||
690 | for (int i = 0; i < numAngles; i++) | 690 | for (int i = 0; i < numAngles; i++) |
691 | { | 691 | { |
692 | int iNext = i == numAngles ? i + 1 : 0; | 692 | //int iNext = i == numAngles ? i + 1 : 0; |
693 | angle = angles.angles[i]; | 693 | angle = angles.angles[i]; |
694 | newVert.X = angle.X * xScale; | 694 | newVert.X = angle.X * xScale; |
695 | newVert.Y = angle.Y * yScale; | 695 | newVert.Y = angle.Y * yScale; |