aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2010-05-16 01:48:28 -0400
committerTeravus Ovares (Dan Olivares)2010-05-16 01:48:28 -0400
commita974146921121c2965cfc60bd6158c76989ebd98 (patch)
tree42089c05aaa3a28af3a22f97badea89275a15899
parent* Revert last commit for now at Melanie_T's request. (diff)
parentMerge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-a974146921121c2965cfc60bd6158c76989ebd98.zip
opensim-SC_OLD-a974146921121c2965cfc60bd6158c76989ebd98.tar.gz
opensim-SC_OLD-a974146921121c2965cfc60bd6158c76989ebd98.tar.bz2
opensim-SC_OLD-a974146921121c2965cfc60bd6158c76989ebd98.tar.xz
Merge branch 'master' of ssh://MyConnection/var/git/opensim
-rw-r--r--OpenSim/Services/HypergridService/UserAgentService.cs10
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs1
2 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 4a275c6..2f1fed4 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -213,15 +213,15 @@ namespace OpenSim.Services.HypergridService
213 public bool VerifyClient(UUID sessionID, string token) 213 public bool VerifyClient(UUID sessionID, string token)
214 { 214 {
215 m_log.DebugFormat("[USER AGENT SERVICE]: Verifying Client session {0} with token {1}", sessionID, token); 215 m_log.DebugFormat("[USER AGENT SERVICE]: Verifying Client session {0} with token {1}", sessionID, token);
216 return true; 216 //return true;
217 217
218 // Commenting this for now until I understand better what part of a sender's 218 // Commenting this for now until I understand better what part of a sender's
219 // info stays unchanged throughout a session 219 // info stays unchanged throughout a session
220 //
221 //if (m_TravelingAgents.ContainsKey(sessionID))
222 // return m_TravelingAgents[sessionID].ClientToken == token;
223 220
224 //return false; 221 if (m_TravelingAgents.ContainsKey(sessionID))
222 return m_TravelingAgents[sessionID].ClientToken == token;
223
224 return false;
225 } 225 }
226 226
227 public bool VerifyAgent(UUID sessionID, string token) 227 public bool VerifyAgent(UUID sessionID, string token)
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 7471c77..9d151df 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -746,6 +746,7 @@ namespace OpenSim.Services.LLLoginService
746 m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName); 746 m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName);
747 if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, out reason)) 747 if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, out reason))
748 { 748 {
749 //IPAddress addr = NetworkUtil.GetIPFor(clientIP.Address, gatekeeper.ExternalEndPoint.Address);
749 m_UserAgentService.SetClientToken(aCircuit.SessionID, clientIP.Address.ToString()); 750 m_UserAgentService.SetClientToken(aCircuit.SessionID, clientIP.Address.ToString());
750 return true; 751 return true;
751 } 752 }