diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs | 5 | ||||
-rwxr-xr-x | OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs index e32e423..7d1d238 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs | |||
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
58 | ClientStackUserSettings userSettings = new ClientStackUserSettings(); | 58 | ClientStackUserSettings userSettings = new ClientStackUserSettings(); |
59 | 59 | ||
60 | uint port = 666; | 60 | uint port = 666; |
61 | testLLUDPServer.Initialise(null, ref port, 0, false, userSettings, null, null); | 61 | testLLUDPServer.Initialise(null, ref port, 0, false, userSettings, null, new AgentCircuitManager()); |
62 | LLPacketServer packetServer = new LLPacketServer(testLLUDPServer, userSettings); | 62 | LLPacketServer packetServer = new LLPacketServer(testLLUDPServer, userSettings); |
63 | testLLUDPServer.LocalScene = new MockScene(); | 63 | testLLUDPServer.LocalScene = new MockScene(); |
64 | 64 | ||
@@ -73,7 +73,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
73 | testLLUDPServer.LoadReceive(uccp, testEp); | 73 | testLLUDPServer.LoadReceive(uccp, testEp); |
74 | testLLUDPServer.ReceiveData(null); | 74 | testLLUDPServer.ReceiveData(null); |
75 | 75 | ||
76 | //Assert.IsTrue(testLLUDPServer.HasCircuit(123456)); | 76 | Assert.IsFalse(testLLUDPServer.HasCircuit(101)); |
77 | Assert.IsTrue(testLLUDPServer.HasCircuit(123456)); | ||
77 | } | 78 | } |
78 | } | 79 | } |
79 | } | 80 | } |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs index bd5b282..252b2fc 100755 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs | |||
@@ -28,6 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Net; | 30 | using System.Net; |
31 | using System.Net.Sockets; | ||
31 | using OpenMetaverse.Packets; | 32 | using OpenMetaverse.Packets; |
32 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
33 | using OpenSim.Framework.Communications.Cache; | 34 | using OpenSim.Framework.Communications.Cache; |
@@ -65,6 +66,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
65 | return true; | 66 | return true; |
66 | } | 67 | } |
67 | 68 | ||
69 | public override void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode) | ||
70 | { | ||
71 | // Don't do anything just yet | ||
72 | } | ||
73 | |||
68 | /// <summary> | 74 | /// <summary> |
69 | /// Load a packet to be received by the LLUDPServer on the next receive call | 75 | /// Load a packet to be received by the LLUDPServer on the next receive call |
70 | /// </summary> | 76 | /// </summary> |
@@ -81,7 +87,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
81 | public void ReceiveData(IAsyncResult result) | 87 | public void ReceiveData(IAsyncResult result) |
82 | { | 88 | { |
83 | OnReceivedData(result); | 89 | OnReceivedData(result); |
84 | } | 90 | } |
85 | 91 | ||
86 | /// <summary> | 92 | /// <summary> |
87 | /// Has a circuit with the given code been established? | 93 | /// Has a circuit with the given code been established? |