diff options
Diffstat (limited to 'OpenSim/Region/CoreModules')
3 files changed, 28 insertions, 18 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs index ecb6c91..2a9366c 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs | |||
@@ -109,6 +109,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Login | |||
109 | 109 | ||
110 | public void RegionLoaded(Scene scene) | 110 | public void RegionLoaded(Scene scene) |
111 | { | 111 | { |
112 | if (!m_Enabled) | ||
113 | return; | ||
114 | |||
112 | if (!m_Registered) | 115 | if (!m_Registered) |
113 | { | 116 | { |
114 | m_Registered = true; | 117 | m_Registered = true; |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs index 03a5124..5ee1c97 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs | |||
@@ -91,6 +91,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation | |||
91 | if (!m_Enabled) | 91 | if (!m_Enabled) |
92 | return; | 92 | return; |
93 | 93 | ||
94 | } | ||
95 | |||
96 | public void RemoveRegion(Scene scene) | ||
97 | { | ||
98 | } | ||
99 | |||
100 | public void RegionLoaded(Scene scene) | ||
101 | { | ||
102 | if (!m_Enabled) | ||
103 | return; | ||
104 | |||
94 | if (!m_Registered) | 105 | if (!m_Registered) |
95 | { | 106 | { |
96 | m_Registered = true; | 107 | m_Registered = true; |
@@ -103,14 +114,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation | |||
103 | } | 114 | } |
104 | } | 115 | } |
105 | 116 | ||
106 | public void RemoveRegion(Scene scene) | ||
107 | { | ||
108 | } | ||
109 | |||
110 | public void RegionLoaded(Scene scene) | ||
111 | { | ||
112 | } | ||
113 | |||
114 | #endregion | 117 | #endregion |
115 | 118 | ||
116 | } | 119 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs index b7dc283..c9cc368 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | |||
@@ -103,6 +103,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
103 | 103 | ||
104 | public void AddRegion(Scene scene) | 104 | public void AddRegion(Scene scene) |
105 | { | 105 | { |
106 | if (!m_enabled) | ||
107 | return; | ||
108 | |||
109 | if (!initialized) | ||
110 | { | ||
111 | InitOnce(scene); | ||
112 | initialized = true; | ||
113 | } | ||
114 | InitEach(scene); | ||
106 | } | 115 | } |
107 | 116 | ||
108 | public void RemoveRegion(Scene scene) | 117 | public void RemoveRegion(Scene scene) |
@@ -116,15 +125,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
116 | 125 | ||
117 | public void RegionLoaded(Scene scene) | 126 | public void RegionLoaded(Scene scene) |
118 | { | 127 | { |
119 | if (m_enabled) | 128 | if (!m_enabled) |
120 | { | 129 | return; |
121 | if (!initialized) | 130 | |
122 | { | 131 | m_hyperlinkService = m_aScene.RequestModuleInterface<IHyperlinkService>(); |
123 | InitOnce(scene); | 132 | |
124 | initialized = true; | ||
125 | } | ||
126 | InitEach(scene); | ||
127 | } | ||
128 | } | 133 | } |
129 | 134 | ||
130 | public Type ReplaceableInterface | 135 | public Type ReplaceableInterface |
@@ -148,7 +153,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
148 | m_localBackend = new LocalSimulationConnectorModule(); | 153 | m_localBackend = new LocalSimulationConnectorModule(); |
149 | m_commsManager = scene.CommsManager; | 154 | m_commsManager = scene.CommsManager; |
150 | m_aScene = scene; | 155 | m_aScene = scene; |
151 | m_hyperlinkService = m_aScene.RequestModuleInterface<IHyperlinkService>(); | ||
152 | //m_regionClient = new RegionToRegionClient(m_aScene, m_hyperlinkService); | 156 | //m_regionClient = new RegionToRegionClient(m_aScene, m_hyperlinkService); |
153 | m_thisIP = Util.GetHostFromDNS(scene.RegionInfo.ExternalHostName); | 157 | m_thisIP = Util.GetHostFromDNS(scene.RegionInfo.ExternalHostName); |
154 | } | 158 | } |