diff options
author | Melanie Thielker | 2015-10-31 00:01:35 +0100 |
---|---|---|
committer | Melanie Thielker | 2015-10-31 00:01:35 +0100 |
commit | dc6d9eadf33b9a0321664d676030b07b2bd04bed (patch) | |
tree | 86d8bd48a294b7e0adaf0c6c85c69f4752382c9f /OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | |
parent | fix services handling of visualparameters, avoiding possible crashs (mantis 7... (diff) | |
download | opensim-SC_OLD-dc6d9eadf33b9a0321664d676030b07b2bd04bed.zip opensim-SC_OLD-dc6d9eadf33b9a0321664d676030b07b2bd04bed.tar.gz opensim-SC_OLD-dc6d9eadf33b9a0321664d676030b07b2bd04bed.tar.bz2 opensim-SC_OLD-dc6d9eadf33b9a0321664d676030b07b2bd04bed.tar.xz |
Testing stage of the new versioning system. Use at own risk. May not
work. Will eat your babies. Yada. Yada.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs index f963242..e2f52c4 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | |||
@@ -205,21 +205,21 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
205 | return m_remoteConnector.UpdateAgent(destination, cAgentData); | 205 | return m_remoteConnector.UpdateAgent(destination, cAgentData); |
206 | } | 206 | } |
207 | 207 | ||
208 | public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string sversion, List<UUID> features, out string version, out string reason) | 208 | public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, List<UUID> features, out float version, out string reason) |
209 | { | 209 | { |
210 | reason = "Communications failure"; | 210 | reason = "Communications failure"; |
211 | version = "Unknown"; | 211 | version = 0f; |
212 | 212 | ||
213 | if (destination == null) | 213 | if (destination == null) |
214 | return false; | 214 | return false; |
215 | 215 | ||
216 | // Try local first | 216 | // Try local first |
217 | if (m_localBackend.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, sversion, features, out version, out reason)) | 217 | if (m_localBackend.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, features, out version, out reason)) |
218 | return true; | 218 | return true; |
219 | 219 | ||
220 | // else do the remote thing | 220 | // else do the remote thing |
221 | if (!m_localBackend.IsLocalRegion(destination.RegionID)) | 221 | if (!m_localBackend.IsLocalRegion(destination.RegionID)) |
222 | return m_remoteConnector.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, sversion, features, out version, out reason); | 222 | return m_remoteConnector.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, features, out version, out reason); |
223 | 223 | ||
224 | return false; | 224 | return false; |
225 | } | 225 | } |