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/OptionalModules/World
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
2 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index d469548..54d4e92 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -36,7 +36,7 @@ using Nwc.XmlRpc;
 using Mono.Addins;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs
index cee8851..48c242d 100644
--- a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs
+++ b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs
@@ -36,6 +36,7 @@ using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.Imaging;
 using OpenSim.Framework;
+using OpenSim.Framework.Servers;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 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/OptionalModules/World
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/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index d469548..54d4e92 100644 --- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs +++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -36,7 +36,7 @@ using Nwc.XmlRpc;
36	using Mono.Addins;	36	using Mono.Addins;
37	using OpenMetaverse;	37	using OpenMetaverse;
38	using OpenSim.Framework;	38	using OpenSim.Framework;
39		39	using OpenSim.Framework.Servers;
40	using OpenSim.Framework.Servers.HttpServer;	40	using OpenSim.Framework.Servers.HttpServer;
41	using OpenSim.Region.Framework.Interfaces;	41	using OpenSim.Region.Framework.Interfaces;
42	using OpenSim.Region.Framework.Scenes;	42	using OpenSim.Region.Framework.Scenes;


diff --git a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs index cee8851..48c242d 100644 --- a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs +++ b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs
@@ -36,6 +36,7 @@ using Nini.Config;
36	using OpenMetaverse;	36	using OpenMetaverse;
37	using OpenMetaverse.Imaging;	37	using OpenMetaverse.Imaging;
38	using OpenSim.Framework;	38	using OpenSim.Framework;
		39	using OpenSim.Framework.Servers;
39	using OpenSim.Region.Framework.Interfaces;	40	using OpenSim.Region.Framework.Interfaces;
40	using OpenSim.Region.Framework.Scenes;	41	using OpenSim.Region.Framework.Scenes;
41	using OpenSim.Server.Base;	42	using OpenSim.Server.Base;