diff options
author | Diva Canto | 2010-01-11 07:45:47 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-11 07:45:47 -0800 |
commit | 001d3695683d9511446d194feeb763c437170028 (patch) | |
tree | 037954a2227cfd5551ddbd9e1d3b1271284c151f /OpenSim/Region/CoreModules | |
parent | Remove CreateCommsManagerPlugin (diff) | |
download | opensim-SC-001d3695683d9511446d194feeb763c437170028.zip opensim-SC-001d3695683d9511446d194feeb763c437170028.tar.gz opensim-SC-001d3695683d9511446d194feeb763c437170028.tar.bz2 opensim-SC-001d3695683d9511446d194feeb763c437170028.tar.xz |
CommunicationsManager deleted.
Diffstat (limited to 'OpenSim/Region/CoreModules')
3 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs index cc5b0e4..cf06e01 100644 --- a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs | |||
@@ -157,7 +157,6 @@ namespace OpenSim.Region.CoreModules.Framework.Library | |||
157 | 157 | ||
158 | RegionInfo regInfo = new RegionInfo(); | 158 | RegionInfo regInfo = new RegionInfo(); |
159 | Scene m_MockScene = new Scene(regInfo); | 159 | Scene m_MockScene = new Scene(regInfo); |
160 | m_MockScene.CommsManager = m_Scene.CommsManager; | ||
161 | LocalInventoryService invService = new LocalInventoryService(lib); | 160 | LocalInventoryService invService = new LocalInventoryService(lib); |
162 | m_MockScene.RegisterModuleInterface<IInventoryService>(invService); | 161 | m_MockScene.RegisterModuleInterface<IInventoryService>(invService); |
163 | m_MockScene.RegisterModuleInterface<IAssetService>(m_Scene.AssetService); | 162 | m_MockScene.RegisterModuleInterface<IAssetService>(m_Scene.AssetService); |
diff --git a/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs b/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs index f9bc935..b7d3904 100644 --- a/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs +++ b/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs | |||
@@ -46,7 +46,6 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
46 | { | 46 | { |
47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
48 | private readonly List<Scene> m_scenes = new List<Scene>(); | 48 | private readonly List<Scene> m_scenes = new List<Scene>(); |
49 | private CommunicationsManager m_com; | ||
50 | private IConfigSource m_settings; | 49 | private IConfigSource m_settings; |
51 | 50 | ||
52 | #region Implementation of IRegionModuleBase | 51 | #region Implementation of IRegionModuleBase |
@@ -88,7 +87,6 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
88 | { | 87 | { |
89 | if (m_settings.Configs["Startup"].GetBoolean("gridmode", false)) | 88 | if (m_settings.Configs["Startup"].GetBoolean("gridmode", false)) |
90 | { | 89 | { |
91 | m_com = m_scenes[0].CommsManager; | ||
92 | MainServer.Instance.AddXmlRPCHandler("grid_message", GridWideMessage); | 90 | MainServer.Instance.AddXmlRPCHandler("grid_message", GridWideMessage); |
93 | } | 91 | } |
94 | } | 92 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs index 81496d6..bd2d8cb 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | |||
@@ -58,8 +58,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
58 | protected LocalSimulationConnectorModule m_localBackend; | 58 | protected LocalSimulationConnectorModule m_localBackend; |
59 | protected SimulationServiceConnector m_remoteConnector; | 59 | protected SimulationServiceConnector m_remoteConnector; |
60 | 60 | ||
61 | protected CommunicationsManager m_commsManager; | ||
62 | |||
63 | protected IHyperlinkService m_hyperlinkService; | 61 | protected IHyperlinkService m_hyperlinkService; |
64 | 62 | ||
65 | protected bool m_safemode; | 63 | protected bool m_safemode; |
@@ -150,7 +148,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
150 | protected virtual void InitOnce(Scene scene) | 148 | protected virtual void InitOnce(Scene scene) |
151 | { | 149 | { |
152 | m_localBackend = new LocalSimulationConnectorModule(); | 150 | m_localBackend = new LocalSimulationConnectorModule(); |
153 | m_commsManager = scene.CommsManager; | ||
154 | m_aScene = scene; | 151 | m_aScene = scene; |
155 | //m_regionClient = new RegionToRegionClient(m_aScene, m_hyperlinkService); | 152 | //m_regionClient = new RegionToRegionClient(m_aScene, m_hyperlinkService); |
156 | m_thisIP = Util.GetHostFromDNS(scene.RegionInfo.ExternalHostName); | 153 | m_thisIP = Util.GetHostFromDNS(scene.RegionInfo.ExternalHostName); |