Merge branch 'master' into bigmerge

Conflicts: OpenSim/Framework/Watchdog.cs
author: Melanie 2011-10-26 01:27:24 +0100
committer: Melanie 2011-10-26 01:27:24 +0100
commit: fd22159d0c7d7b149d35747cbaa436f3b1e6f579 (patch)
tree: bbe8cdc63dd1f98346a6afb844f4b4d3caf336a8 /OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
parent: Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmerge (diff)
parent: Restart the event queue worker threads that I accidentally disabled earlier t... (diff)
download: opensim-SC_OLD-fd22159d0c7d7b149d35747cbaa436f3b1e6f579.zip
opensim-SC_OLD-fd22159d0c7d7b149d35747cbaa436f3b1e6f579.tar.gz
opensim-SC_OLD-fd22159d0c7d7b149d35747cbaa436f3b1e6f579.tar.bz2
opensim-SC_OLD-fd22159d0c7d7b149d35747cbaa436f3b1e6f579.tar.xz
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
index 422f394..5541684 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
@@ -31,6 +31,7 @@ using System.Collections.Generic;
 using log4net;
 using Nini.Config;
 using OpenSim.Framework;
+using OpenSim.Framework.Servers;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Server.Base;
author	Melanie	2011-10-26 01:27:24 +0100
committer	Melanie	2011-10-26 01:27:24 +0100
commit	fd22159d0c7d7b149d35747cbaa436f3b1e6f579 (patch)
tree	bbe8cdc63dd1f98346a6afb844f4b4d3caf336a8 /OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
parent	Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmerge (diff)
parent	Restart the event queue worker threads that I accidentally disabled earlier t... (diff)
download	opensim-SC_OLD-fd22159d0c7d7b149d35747cbaa436f3b1e6f579.zip opensim-SC_OLD-fd22159d0c7d7b149d35747cbaa436f3b1e6f579.tar.gz opensim-SC_OLD-fd22159d0c7d7b149d35747cbaa436f3b1e6f579.tar.bz2 opensim-SC_OLD-fd22159d0c7d7b149d35747cbaa436f3b1e6f579.tar.xz

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs index 422f394..5541684 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
@@ -31,6 +31,7 @@ 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;
34	using OpenSim.Region.Framework.Scenes;	35	using OpenSim.Region.Framework.Scenes;
35	using OpenSim.Region.Framework.Interfaces;	36	using OpenSim.Region.Framework.Interfaces;
36	using OpenSim.Server.Base;	37	using OpenSim.Server.Base;