Merge branch 'testmerge' into queuetest

Conflicts: OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
author: Mic Bowman 2011-04-13 15:41:17 -0700
committer: Mic Bowman 2011-04-13 15:41:17 -0700
commit: 590d20903c6dd596cb8ae3337065f955bd207b67 (patch)
tree: f6b60205fd58b03f03c9110a68b2036a3ef075d2 /OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
parent: Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queu... (diff)
parent: remove packet monitoring debugging code (diff)
download: opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.zip
opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.tar.gz
opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.tar.bz2
opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.tar.xz
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
index 35518d5..5c32632 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
@@ -31,7 +31,6 @@ using System.Collections.Generic;
 using log4net;
 using Nini.Config;
 using OpenSim.Framework;
-using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Server.Base;
author	Mic Bowman	2011-04-13 15:41:17 -0700
committer	Mic Bowman	2011-04-13 15:41:17 -0700
commit	590d20903c6dd596cb8ae3337065f955bd207b67 (patch)
tree	f6b60205fd58b03f03c9110a68b2036a3ef075d2 /OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
parent	Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queu... (diff)
parent	remove packet monitoring debugging code (diff)
download	opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.zip opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.tar.gz opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.tar.bz2 opensim-SC_OLD-590d20903c6dd596cb8ae3337065f955bd207b67.tar.xz

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs index 35518d5..5c32632 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
@@ -31,7 +31,6 @@ using System.Collections.Generic;
31	using log4net;	31	using log4net;
32	using Nini.Config;	32	using Nini.Config;
33	using OpenSim.Framework;	33	using OpenSim.Framework;
34	using OpenSim.Framework.Servers.HttpServer;
35	using OpenSim.Region.Framework.Scenes;	34	using OpenSim.Region.Framework.Scenes;
36	using OpenSim.Region.Framework.Interfaces;	35	using OpenSim.Region.Framework.Interfaces;
37	using OpenSim.Server.Base;	36	using OpenSim.Server.Base;