diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
| commit | 311b51a1843f43daa7796a46961b65fe702e1b85 (patch) | |
| tree | 756554b330c8bdd970f319c3af0327efb9017673 /OpenSim/Region/ClientStack/LindenUDP/Tests | |
| parent | * Some Physics Scene Changes to prepare for larger regions (diff) | |
| parent | Fixes mantis #4020 (http://opensimulator.org/mantis/view.php?id=4020) (diff) | |
| download | opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.zip opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.gz opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.bz2 opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.xz | |
*remove conflicts
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/Tests')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs index bd11d97..9fb1041 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs | |||
| @@ -34,6 +34,7 @@ using OpenMetaverse; | |||
| 34 | using OpenMetaverse.Packets; | 34 | using OpenMetaverse.Packets; |
| 35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
| 36 | using OpenSim.Tests.Common; | 36 | using OpenSim.Tests.Common; |
| 37 | using OpenSim.Tests.Common.Mock; | ||
| 37 | 38 | ||
| 38 | namespace OpenSim.Region.ClientStack.LindenUDP.Tests | 39 | namespace OpenSim.Region.ClientStack.LindenUDP.Tests |
| 39 | { | 40 | { |