diff options
Diffstat (limited to '')
5 files changed, 4 insertions, 16 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs index b2cf14c..1f564b7 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs | |||
@@ -26,17 +26,13 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Net; | 28 | using System.Net; |
29 | using System.Threading; | 29 | using log4net.Config; |
30 | using log4net; | ||
31 | using Nini.Config; | 30 | using Nini.Config; |
32 | using NUnit.Framework; | 31 | using NUnit.Framework; |
33 | using NUnit.Framework.SyntaxHelpers; | 32 | using NUnit.Framework.SyntaxHelpers; |
34 | using OpenMetaverse; | 33 | using OpenMetaverse; |
35 | using OpenMetaverse.Packets; | 34 | using OpenMetaverse.Packets; |
36 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
37 | using OpenSim.Framework.Communications; | ||
38 | using OpenSim.Region.ClientStack; | ||
39 | using OpenSim.Region.ClientStack.LindenUDP; | ||
40 | 36 | ||
41 | namespace OpenSim.Region.ClientStack.LindenUDP.Tests | 37 | namespace OpenSim.Region.ClientStack.LindenUDP.Tests |
42 | { | 38 | { |
@@ -51,7 +47,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
51 | { | 47 | { |
52 | try | 48 | try |
53 | { | 49 | { |
54 | log4net.Config.XmlConfigurator.Configure(); | 50 | XmlConfigurator.Configure(); |
55 | } | 51 | } |
56 | catch | 52 | catch |
57 | { | 53 | { |
@@ -118,7 +114,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
118 | UseCircuitCodePacket uccp = new UseCircuitCodePacket(); | 114 | UseCircuitCodePacket uccp = new UseCircuitCodePacket(); |
119 | 115 | ||
120 | UseCircuitCodePacket.CircuitCodeBlock uccpCcBlock | 116 | UseCircuitCodePacket.CircuitCodeBlock uccpCcBlock |
121 | = new OpenMetaverse.Packets.UseCircuitCodePacket.CircuitCodeBlock(); | 117 | = new UseCircuitCodePacket.CircuitCodeBlock(); |
122 | uccpCcBlock.Code = circuitCode; | 118 | uccpCcBlock.Code = circuitCode; |
123 | uccpCcBlock.ID = agentId; | 119 | uccpCcBlock.ID = agentId; |
124 | uccpCcBlock.SessionID = sessionId; | 120 | uccpCcBlock.SessionID = sessionId; |
@@ -169,7 +165,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
169 | UseCircuitCodePacket uccp = new UseCircuitCodePacket(); | 165 | UseCircuitCodePacket uccp = new UseCircuitCodePacket(); |
170 | 166 | ||
171 | UseCircuitCodePacket.CircuitCodeBlock uccpCcBlock | 167 | UseCircuitCodePacket.CircuitCodeBlock uccpCcBlock |
172 | = new OpenMetaverse.Packets.UseCircuitCodePacket.CircuitCodeBlock(); | 168 | = new UseCircuitCodePacket.CircuitCodeBlock(); |
173 | uccpCcBlock.Code = myCircuitCode; | 169 | uccpCcBlock.Code = myCircuitCode; |
174 | uccpCcBlock.ID = myAgentUuid; | 170 | uccpCcBlock.ID = myAgentUuid; |
175 | uccpCcBlock.SessionID = mySessionUuid; | 171 | uccpCcBlock.SessionID = mySessionUuid; |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs index 90d7d63..d4e906a 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs | |||
@@ -25,8 +25,6 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Xml; | ||
29 | using Nini.Config; | ||
30 | using OpenMetaverse; | 28 | using OpenMetaverse; |
31 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
32 | using OpenSim.Region.Framework.Scenes; | 30 | using OpenSim.Region.Framework.Scenes; |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs index d421f82..6e429a4 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs | |||
@@ -25,14 +25,12 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Threading; | ||
29 | using Nini.Config; | 28 | using Nini.Config; |
30 | using NUnit.Framework; | 29 | using NUnit.Framework; |
31 | using NUnit.Framework.SyntaxHelpers; | 30 | using NUnit.Framework.SyntaxHelpers; |
32 | using OpenMetaverse; | 31 | using OpenMetaverse; |
33 | using OpenMetaverse.Packets; | 32 | using OpenMetaverse.Packets; |
34 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
35 | using OpenSim.Region.ClientStack.LindenUDP; | ||
36 | using OpenSim.Tests.Common.Mock; | 34 | using OpenSim.Tests.Common.Mock; |
37 | 35 | ||
38 | namespace OpenSim.Region.ClientStack.LindenUDP.Tests | 36 | namespace OpenSim.Region.ClientStack.LindenUDP.Tests |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs index 507fe82..667014e 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs | |||
@@ -26,9 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using OpenMetaverse; | ||
30 | using OpenMetaverse.Packets; | 29 | using OpenMetaverse.Packets; |
31 | using OpenSim.Region.ClientStack.LindenUDP; | ||
32 | 30 | ||
33 | namespace OpenSim.Region.ClientStack.LindenUDP.Tests | 31 | namespace OpenSim.Region.ClientStack.LindenUDP.Tests |
34 | { | 32 | { |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs index 91fadba..53506d3 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs | |||
@@ -30,8 +30,6 @@ using System.Collections.Generic; | |||
30 | using System.Net; | 30 | using System.Net; |
31 | using System.Net.Sockets; | 31 | using System.Net.Sockets; |
32 | using OpenMetaverse.Packets; | 32 | using OpenMetaverse.Packets; |
33 | using OpenSim.Framework; | ||
34 | using OpenSim.Framework.Communications.Cache; | ||
35 | 33 | ||
36 | namespace OpenSim.Region.ClientStack.LindenUDP.Tests | 34 | namespace OpenSim.Region.ClientStack.LindenUDP.Tests |
37 | { | 35 | { |