diff options
author | BlueWall | 2011-03-21 22:06:43 -0400 |
---|---|---|
committer | BlueWall | 2011-03-21 22:06:43 -0400 |
commit | e3c327a305dcf795f372b940f34538a19bf92218 (patch) | |
tree | b034355a12c4d87410809aa19bf6015e611e1e22 /OpenSim/Region/CoreModules/ServiceConnectorsOut | |
parent | Merge branch 'master' of /home/opensim/src/OpenSim/Core (diff) | |
parent | Thanks Kevin Cozens for a patch that: (diff) | |
download | opensim-SC_OLD-e3c327a305dcf795f372b940f34538a19bf92218.zip opensim-SC_OLD-e3c327a305dcf795f372b940f34538a19bf92218.tar.gz opensim-SC_OLD-e3c327a305dcf795f372b940f34538a19bf92218.tar.bz2 opensim-SC_OLD-e3c327a305dcf795f372b940f34538a19bf92218.tar.xz |
Merge branch 'master' of /home/opensim/src/OpenSim/Core
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
4 files changed, 13 insertions, 23 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs index e54ee02..18db9fa 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs | |||
@@ -32,7 +32,6 @@ using System.Reflection; | |||
32 | using System.Threading; | 32 | using System.Threading; |
33 | using log4net.Config; | 33 | using log4net.Config; |
34 | using NUnit.Framework; | 34 | using NUnit.Framework; |
35 | using NUnit.Framework.SyntaxHelpers; | ||
36 | using OpenMetaverse; | 35 | using OpenMetaverse; |
37 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
38 | using Nini.Config; | 37 | using Nini.Config; |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs index ef910f4..e471f75 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs | |||
@@ -32,7 +32,6 @@ using System.Reflection; | |||
32 | using System.Threading; | 32 | using System.Threading; |
33 | using log4net.Config; | 33 | using log4net.Config; |
34 | using NUnit.Framework; | 34 | using NUnit.Framework; |
35 | using NUnit.Framework.SyntaxHelpers; | ||
36 | using OpenMetaverse; | 35 | using OpenMetaverse; |
37 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
38 | using Nini.Config; | 37 | using Nini.Config; |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs index 56720b7..a298b65 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | |||
@@ -257,15 +257,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
257 | return false; | 257 | return false; |
258 | } | 258 | } |
259 | 259 | ||
260 | public bool QueryAccess(GridRegion destination, UUID id, Vector3 position) | 260 | public bool QueryAccess(GridRegion destination, UUID id, Vector3 position, out string reason) |
261 | { | 261 | { |
262 | reason = "Communications failure"; | ||
262 | if (destination == null) | 263 | if (destination == null) |
263 | return false; | 264 | return false; |
264 | 265 | ||
265 | foreach (Scene s in m_sceneList) | 266 | foreach (Scene s in m_sceneList) |
266 | { | 267 | { |
267 | if (s.RegionInfo.RegionID == destination.RegionID) | 268 | if (s.RegionInfo.RegionID == destination.RegionID) |
268 | return s.QueryAccess(id, position); | 269 | return s.QueryAccess(id, position, out reason); |
269 | } | 270 | } |
270 | //m_log.Debug("[LOCAL COMMS]: region not found for QueryAccess"); | 271 | //m_log.Debug("[LOCAL COMMS]: region not found for QueryAccess"); |
271 | return false; | 272 | return false; |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs index c4919b3..67f4d60 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | |||
@@ -192,15 +192,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
192 | return false; | 192 | return false; |
193 | 193 | ||
194 | // Try local first | 194 | // Try local first |
195 | if (m_localBackend.UpdateAgent(destination, cAgentData)) | 195 | if (m_localBackend.IsLocalRegion(destination.RegionHandle)) |
196 | return true; | 196 | return m_localBackend.UpdateAgent(destination, cAgentData); |
197 | |||
198 | // else do the remote thing | ||
199 | if (!m_localBackend.IsLocalRegion(destination.RegionHandle)) | ||
200 | return m_remoteConnector.UpdateAgent(destination, cAgentData); | ||
201 | |||
202 | return false; | ||
203 | 197 | ||
198 | return m_remoteConnector.UpdateAgent(destination, cAgentData); | ||
204 | } | 199 | } |
205 | 200 | ||
206 | public bool UpdateAgent(GridRegion destination, AgentPosition cAgentData) | 201 | public bool UpdateAgent(GridRegion destination, AgentPosition cAgentData) |
@@ -209,15 +204,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
209 | return false; | 204 | return false; |
210 | 205 | ||
211 | // Try local first | 206 | // Try local first |
212 | if (m_localBackend.UpdateAgent(destination, cAgentData)) | 207 | if (m_localBackend.IsLocalRegion(destination.RegionHandle)) |
213 | return true; | 208 | return m_localBackend.UpdateAgent(destination, cAgentData); |
214 | |||
215 | // else do the remote thing | ||
216 | if (!m_localBackend.IsLocalRegion(destination.RegionHandle)) | ||
217 | return m_remoteConnector.UpdateAgent(destination, cAgentData); | ||
218 | |||
219 | return false; | ||
220 | 209 | ||
210 | return m_remoteConnector.UpdateAgent(destination, cAgentData); | ||
221 | } | 211 | } |
222 | 212 | ||
223 | public bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent) | 213 | public bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent) |
@@ -239,18 +229,19 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
239 | 229 | ||
240 | } | 230 | } |
241 | 231 | ||
242 | public bool QueryAccess(GridRegion destination, UUID id, Vector3 position) | 232 | public bool QueryAccess(GridRegion destination, UUID id, Vector3 position, out string reason) |
243 | { | 233 | { |
234 | reason = "Communications failure"; | ||
244 | if (destination == null) | 235 | if (destination == null) |
245 | return false; | 236 | return false; |
246 | 237 | ||
247 | // Try local first | 238 | // Try local first |
248 | if (m_localBackend.QueryAccess(destination, id, position)) | 239 | if (m_localBackend.QueryAccess(destination, id, position, out reason)) |
249 | return true; | 240 | return true; |
250 | 241 | ||
251 | // else do the remote thing | 242 | // else do the remote thing |
252 | if (!m_localBackend.IsLocalRegion(destination.RegionHandle)) | 243 | if (!m_localBackend.IsLocalRegion(destination.RegionHandle)) |
253 | return m_remoteConnector.QueryAccess(destination, id, position); | 244 | return m_remoteConnector.QueryAccess(destination, id, position, out reason); |
254 | 245 | ||
255 | return false; | 246 | return false; |
256 | 247 | ||