aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-07-22 18:01:54 +0100
committerJustin Clark-Casey (justincc)2014-07-22 18:04:28 +0100
commit3a87cce2e0367a631c4ee2d9e4fae8c701bd604a (patch)
treedab2d449137e0ea7a1595a5725f8a5f17b3a9092 /OpenSim/Services
parentminor: convert tabs to spaces that got in on recent commit 4a9282e (diff)
downloadopensim-SC_OLD-3a87cce2e0367a631c4ee2d9e4fae8c701bd604a.zip
opensim-SC_OLD-3a87cce2e0367a631c4ee2d9e4fae8c701bd604a.tar.gz
opensim-SC_OLD-3a87cce2e0367a631c4ee2d9e4fae8c701bd604a.tar.bz2
opensim-SC_OLD-3a87cce2e0367a631c4ee2d9e4fae8c701bd604a.tar.xz
Fix recent regression in 3c6becd5 where login or hg login to variable sized regions failed with outdated simulator message.
I forgot that a null 'their version' would not be passed over the wire and ends up as an empty string instead (like older simulators). So instead pass through the correct simulator protcol version instead (SIMULATOR/0.3) when querying from login or hg login. Also removes a debug console write for agent limit accidentally left in for the same commit. Relates to mantis 7276
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/HypergridService/GatekeeperService.cs2
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs7
2 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 771114e..15d3305 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -436,7 +436,7 @@ namespace OpenSim.Services.HypergridService
436 436
437 if (!m_SimulationService.QueryAccess( 437 if (!m_SimulationService.QueryAccess(
438 destination, aCircuit.AgentID, aCircuit.ServiceURLs["HomeURI"].ToString(), 438 destination, aCircuit.AgentID, aCircuit.ServiceURLs["HomeURI"].ToString(),
439 true, aCircuit.startpos, null, out version, out reason)) 439 true, aCircuit.startpos, "SIMULATION/0.3", out version, out reason))
440 return false; 440 return false;
441 441
442 return m_SimulationService.CreateAgent(source, destination, aCircuit, (uint)loginFlag, out reason); 442 return m_SimulationService.CreateAgent(source, destination, aCircuit, (uint)loginFlag, out reason);
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 264a630..0ad9f92 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -961,7 +961,9 @@ namespace OpenSim.Services.LLLoginService
961 { 961 {
962 string version; 962 string version;
963 963
964 if (!simConnector.QueryAccess(region, aCircuit.AgentID, null, true, aCircuit.startpos, null, out version, out reason)) 964 if (
965 !simConnector.QueryAccess(
966 region, aCircuit.AgentID, null, true, aCircuit.startpos, "SIMULATION/0.3", out version, out reason))
965 return false; 967 return false;
966 968
967 return simConnector.CreateAgent(null, region, aCircuit, (uint)flags, out reason); 969 return simConnector.CreateAgent(null, region, aCircuit, (uint)flags, out reason);
@@ -969,9 +971,8 @@ namespace OpenSim.Services.LLLoginService
969 971
970 private bool LaunchAgentIndirectly(GridRegion gatekeeper, GridRegion destination, AgentCircuitData aCircuit, IPEndPoint clientIP, out string reason) 972 private bool LaunchAgentIndirectly(GridRegion gatekeeper, GridRegion destination, AgentCircuitData aCircuit, IPEndPoint clientIP, out string reason)
971 { 973 {
972 string version;
973
974 m_log.Debug("[LLOGIN SERVICE]: Launching agent at " + destination.RegionName); 974 m_log.Debug("[LLOGIN SERVICE]: Launching agent at " + destination.RegionName);
975
975 if (m_UserAgentService.LoginAgentToGrid(null, aCircuit, gatekeeper, destination, true, out reason)) 976 if (m_UserAgentService.LoginAgentToGrid(null, aCircuit, gatekeeper, destination, true, out reason))
976 return true; 977 return true;
977 return false; 978 return false;