aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorDiva Canto2014-06-06 11:04:53 -0700
committerDiva Canto2014-06-06 11:04:53 -0700
commitfe779128b0c50f44cf479444444754298d829910 (patch)
tree5323ae27955f5bba00624e4d7c3e76b6374cb80f /OpenSim/Server
parentBetter comment regarding SizeX and SizeY (diff)
downloadopensim-SC_OLD-fe779128b0c50f44cf479444444754298d829910.zip
opensim-SC_OLD-fe779128b0c50f44cf479444444754298d829910.tar.gz
opensim-SC_OLD-fe779128b0c50f44cf479444444754298d829910.tar.bz2
opensim-SC_OLD-fe779128b0c50f44cf479444444754298d829910.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/Server')
-rw-r--r--OpenSim/Server/Handlers/Simulation/AgentHandlers.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 7291931..6d3a3a7 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -144,12 +144,16 @@ namespace OpenSim.Server.Handlers.Simulation
144 if (args.ContainsKey("agent_home_uri")) 144 if (args.ContainsKey("agent_home_uri"))
145 agentHomeURI = args["agent_home_uri"].AsString(); 145 agentHomeURI = args["agent_home_uri"].AsString();
146 146
147 string theirVersion = string.Empty;
148 if (args.ContainsKey("my_version"))
149 theirVersion = args["my_version"].AsString();
150
147 GridRegion destination = new GridRegion(); 151 GridRegion destination = new GridRegion();
148 destination.RegionID = regionID; 152 destination.RegionID = regionID;
149 153
150 string reason; 154 string reason;
151 string version; 155 string version;
152 bool result = m_SimulationService.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, out version, out reason); 156 bool result = m_SimulationService.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, theirVersion, out version, out reason);
153 157
154 responsedata["int_response_code"] = HttpStatusCode.OK; 158 responsedata["int_response_code"] = HttpStatusCode.OK;
155 159