diff options
| author | Justin Clark-Casey (justincc) | 2011-10-25 20:24:21 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-10-25 20:24:21 +0100 |
| commit | 8a0a78cbccce796addacab7ed1609279b802a9b3 (patch) | |
| tree | 31ddb6da7bca6eeb61cb7747532dcf77828cfbe3 /OpenSim/Region/OptionalModules | |
| parent | Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer() (diff) | |
| download | opensim-SC_OLD-8a0a78cbccce796addacab7ed1609279b802a9b3.zip opensim-SC_OLD-8a0a78cbccce796addacab7ed1609279b802a9b3.tar.gz opensim-SC_OLD-8a0a78cbccce796addacab7ed1609279b802a9b3.tar.bz2 opensim-SC_OLD-8a0a78cbccce796addacab7ed1609279b802a9b3.tar.xz | |
Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.
This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes.
Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers
Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer
MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
Diffstat (limited to 'OpenSim/Region/OptionalModules')
4 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs index d49a489..913d934 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs | |||
| @@ -34,6 +34,7 @@ using log4net; | |||
| 34 | using Nini.Config; | 34 | using Nini.Config; |
| 35 | using Nwc.XmlRpc; | 35 | using Nwc.XmlRpc; |
| 36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
| 37 | using OpenSim.Framework.Servers; | ||
| 37 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
| 38 | using OpenSim.Region.Framework.Scenes; | 39 | using OpenSim.Region.Framework.Scenes; |
| 39 | 40 | ||
diff --git a/OpenSim/Region/OptionalModules/ServiceConnectorsIn/Freeswitch/FreeswitchServiceInConnectorModule.cs b/OpenSim/Region/OptionalModules/ServiceConnectorsIn/Freeswitch/FreeswitchServiceInConnectorModule.cs index 97fa63c..74c5139 100644 --- a/OpenSim/Region/OptionalModules/ServiceConnectorsIn/Freeswitch/FreeswitchServiceInConnectorModule.cs +++ b/OpenSim/Region/OptionalModules/ServiceConnectorsIn/Freeswitch/FreeswitchServiceInConnectorModule.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.Framework.Servers.HttpServer; | 35 | using OpenSim.Framework.Servers.HttpServer; |
| 35 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
| 36 | using OpenSim.Region.Framework.Interfaces; | 37 | using OpenSim.Region.Framework.Interfaces; |
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index b84a34d..8fc50ff 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; |