diff options
author | Justin Clark-Casey (justincc) | 2011-04-21 23:02:32 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-04-21 23:02:32 +0100 |
commit | 149d4e48d851e83037998d9034a1015975d8d35f (patch) | |
tree | 50f9511dc1a317047d9262e380b64cddbe09ffab /OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs | |
parent | Merge branch 'master' into 0.7.1-dev (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-149d4e48d851e83037998d9034a1015975d8d35f.zip opensim-SC_OLD-149d4e48d851e83037998d9034a1015975d8d35f.tar.gz opensim-SC_OLD-149d4e48d851e83037998d9034a1015975d8d35f.tar.bz2 opensim-SC_OLD-149d4e48d851e83037998d9034a1015975d8d35f.tar.xz |
Merge branch 'master' into 0.7.1-dev
Diffstat (limited to 'OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs index 9e444c4..2cae02d 100644 --- a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs +++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs | |||
@@ -36,7 +36,6 @@ using System.Text; | |||
36 | using Nini.Config; | 36 | using Nini.Config; |
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Framework.Communications; | 38 | using OpenSim.Framework.Communications; |
39 | using OpenSim.Framework.Servers.HttpServer; | ||
40 | using OpenSim.Services.Interfaces; | 39 | using OpenSim.Services.Interfaces; |
41 | using OpenMetaverse; | 40 | using OpenMetaverse; |
42 | using OpenMetaverse.StructuredData; | 41 | using OpenMetaverse.StructuredData; |