Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 24 insertions, 23 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
index a935dd2..eb262d2 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             m_scene = new SceneHelpers().SetupScene();
             StatsManager.SimExtraStats = new SimExtraStatsCollector();
         }
-        
+
 //        /// <summary>
 //        /// Build an object name packet for test purposes
 //        /// </summary>
@@ -84,13 +84,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 //            odb.Name = Utils.StringToBytes(objectName);
 //            onp.ObjectData = new ObjectNamePacket.ObjectDataBlock[] { odb };
 //            onp.Header.Zerocoded = false;
-//            
+//
 //            return onp;
 //        }
 //
         /// <summary>
         /// Test adding a client to the stack
         /// </summary>
+/*        
         [Test]
         public void TestAddClient()
         {
@@ -156,7 +157,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             config.Set("AckTimeout", -1);
             TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(m_scene, ics);
 
-            ScenePresence sp 
+            ScenePresence sp
                 = ClientStackHelpers.AddChildClient(
                     m_scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456);
 
@@ -165,7 +166,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             ScenePresence spAfterAckTimeout = m_scene.GetScenePresence(sp.UUID);
             Assert.That(spAfterAckTimeout, Is.Null);
         }
-
+*/
 //        /// <summary>
 //        /// Test removing a client from the stack
 //        /// </summary>
@@ -175,21 +176,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 //            TestHelper.InMethod();
 //
 //            uint myCircuitCode = 123457;
-//            
+//
 //            TestLLUDPServer testLLUDPServer;
 //            TestLLPacketServer testLLPacketServer;
 //            AgentCircuitManager acm;
 //            SetupStack(new MockScene(), out testLLUDPServer, out testLLPacketServer, out acm);
 //            AddClient(myCircuitCode, new IPEndPoint(IPAddress.Loopback, 1000), testLLUDPServer, acm);
-//            
+//
 //            testLLUDPServer.RemoveClientCircuit(myCircuitCode);
 //            Assert.IsFalse(testLLUDPServer.HasCircuit(myCircuitCode));
-//            
+//
 //            // Check that removing a non-existent circuit doesn't have any bad effects
 //            testLLUDPServer.RemoveClientCircuit(101);
 //            Assert.IsFalse(testLLUDPServer.HasCircuit(101));
 //        }
-//        
+//
 //        /// <summary>
 //        /// Make sure that the client stack reacts okay to malformed packets
 //        /// </summary>
@@ -200,8 +201,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 //
 //            uint myCircuitCode = 123458;
 //            EndPoint testEp = new IPEndPoint(IPAddress.Loopback, 1001);
-//            MockScene scene = new MockScene(); 
-//            
+//            MockScene scene = new MockScene();
+//
 //            TestLLUDPServer testLLUDPServer;
 //            TestLLPacketServer testLLPacketServer;
 //            AgentCircuitManager acm;
@@ -213,24 +214,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 //            // Send two garbled 'packets' in succession
 //            testLLUDPServer.LoadReceive(data, testEp);
 //            testLLUDPServer.LoadReceive(data, testEp);
-//            testLLUDPServer.ReceiveData(null); 
-//            
+//            testLLUDPServer.ReceiveData(null);
+//
 //            // Check that we are still here
 //            Assert.IsTrue(testLLUDPServer.HasCircuit(myCircuitCode));
 //            Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(0));
-//            
+//
 //            // Check that sending a valid packet to same circuit still succeeds
 //            Assert.That(scene.ObjectNameCallsReceived, Is.EqualTo(0));
-//            
+//
 //            testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(1, "helloooo"), testEp);
 //            testLLUDPServer.ReceiveData(null);
-//            
+//
 //            Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(1));
 //            Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(1));
 //        }
-//        
+//
 //        /// <summary>
-//        /// Test that the stack continues to work even if some client has caused a 
+//        /// Test that the stack continues to work even if some client has caused a
 //        /// SocketException on Socket.BeginReceive()
 //        /// </summary>
 //        [Test]
@@ -239,32 +240,32 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 //            TestHelper.InMethod();
 //
 //            MockScene scene = new MockScene();
-//            
+//
 //            uint circuitCodeA = 130000;
 //            EndPoint epA = new IPEndPoint(IPAddress.Loopback, 1300);
 //            UUID agentIdA   = UUID.Parse("00000000-0000-0000-0000-000000001300");
 //            UUID sessionIdA = UUID.Parse("00000000-0000-0000-0000-000000002300");
-//            
+//
 //            uint circuitCodeB = 130001;
 //            EndPoint epB = new IPEndPoint(IPAddress.Loopback, 1301);
 //            UUID agentIdB   = UUID.Parse("00000000-0000-0000-0000-000000001301");
 //            UUID sessionIdB = UUID.Parse("00000000-0000-0000-0000-000000002301");
-//            
+//
 //            TestLLUDPServer testLLUDPServer;
 //            TestLLPacketServer testLLPacketServer;
 //            AgentCircuitManager acm;
 //            SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm);
 //            AddClient(circuitCodeA, epA, agentIdA, sessionIdA, testLLUDPServer, acm);
 //            AddClient(circuitCodeB, epB, agentIdB, sessionIdB, testLLUDPServer, acm);
-//            
+//
 //            testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(1, "packet1"), epA);
 //            testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(1, "packet2"), epB);
 //            testLLUDPServer.LoadReceiveWithBeginException(epA);
 //            testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(2, "packet3"), epB);
 //            testLLUDPServer.ReceiveData(null);
-//            
+//
 //            Assert.IsFalse(testLLUDPServer.HasCircuit(circuitCodeA));
-//         
+//
 //            Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(3));
 //            Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(3));
 //        }