aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors
diff options
context:
space:
mode:
authorDiva Canto2014-06-06 11:04:53 -0700
committerJustin Clark-Casey2014-06-10 20:28:47 +0100
commitffe07527fcd95c1bd8a8d29432fe33e350354538 (patch)
tree614ff2e79275c3aef16bd55be8345e68eb4e6ebd /OpenSim/Services/Connectors
parentBetter comment regarding SizeX and SizeY (diff)
downloadopensim-SC_OLD-ffe07527fcd95c1bd8a8d29432fe33e350354538.zip
opensim-SC_OLD-ffe07527fcd95c1bd8a8d29432fe33e350354538.tar.gz
opensim-SC_OLD-ffe07527fcd95c1bd8a8d29432fe33e350354538.tar.bz2
opensim-SC_OLD-ffe07527fcd95c1bd8a8d29432fe33e350354538.tar.xz
Added simulation version compatibility check so that agents coming from 0.7.6 to a varregion running in 0.8 and above will be denied teleport, rather than be allowed and crash the viewer.
Diffstat (limited to 'OpenSim/Services/Connectors')
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 099ba98..b6fde72 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -282,7 +282,7 @@ namespace OpenSim.Services.Connectors.Simulation
282 } 282 }
283 283
284 284
285 public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, out string version, out string reason) 285 public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string myversion, out string version, out string reason)
286 { 286 {
287 reason = "Failed to contact destination"; 287 reason = "Failed to contact destination";
288 version = "Unknown"; 288 version = "Unknown";
@@ -298,6 +298,7 @@ namespace OpenSim.Services.Connectors.Simulation
298 OSDMap request = new OSDMap(); 298 OSDMap request = new OSDMap();
299 request.Add("viaTeleport", OSD.FromBoolean(viaTeleport)); 299 request.Add("viaTeleport", OSD.FromBoolean(viaTeleport));
300 request.Add("position", OSD.FromString(position.ToString())); 300 request.Add("position", OSD.FromString(position.ToString()));
301 request.Add("my_version", OSD.FromString(myversion));
301 if (agentHomeURI != null) 302 if (agentHomeURI != null)
302 request.Add("agent_home_uri", OSD.FromString(agentHomeURI)); 303 request.Add("agent_home_uri", OSD.FromString(agentHomeURI));
303 304