Merge git://opensimulator.org/git/opensim

author: Sean McNamara 2011-04-23 18:33:08 -0400
committer: Sean McNamara 2011-04-23 18:33:08 -0400
commit: d287e0ac683acb0cab51bf0dbbc9d1fd08bd6bc9 (patch)
tree: 30a24bf66050c66ebe74b68745c4f1764fe09181 /OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
parent: AutoBackup: Removed unneeded imports. (diff)
parent: Added MaxAgents configuration option to RegionConfig.ini allowing region host... (diff)
download: opensim-SC_OLD-d287e0ac683acb0cab51bf0dbbc9d1fd08bd6bc9.zip
opensim-SC_OLD-d287e0ac683acb0cab51bf0dbbc9d1fd08bd6bc9.tar.gz
opensim-SC_OLD-d287e0ac683acb0cab51bf0dbbc9d1fd08bd6bc9.tar.bz2
opensim-SC_OLD-d287e0ac683acb0cab51bf0dbbc9d1fd08bd6bc9.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	Sean McNamara	2011-04-23 18:33:08 -0400
committer	Sean McNamara	2011-04-23 18:33:08 -0400
commit	d287e0ac683acb0cab51bf0dbbc9d1fd08bd6bc9 (patch)
tree	30a24bf66050c66ebe74b68745c4f1764fe09181 /OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
parent	AutoBackup: Removed unneeded imports. (diff)
parent	Added MaxAgents configuration option to RegionConfig.ini allowing region host... (diff)
download	opensim-SC_OLD-d287e0ac683acb0cab51bf0dbbc9d1fd08bd6bc9.zip opensim-SC_OLD-d287e0ac683acb0cab51bf0dbbc9d1fd08bd6bc9.tar.gz opensim-SC_OLD-d287e0ac683acb0cab51bf0dbbc9d1fd08bd6bc9.tar.bz2 opensim-SC_OLD-d287e0ac683acb0cab51bf0dbbc9d1fd08bd6bc9.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;