aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/HypergridService/UserAgentService.cs
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2010-05-15 23:22:07 -0400
committerTeravus Ovares (Dan Olivares)2010-05-15 23:22:07 -0400
commit019925bb2f87695cd16d1bebff4ef300b16e67f1 (patch)
treeb596598ebde44e1bd69c64898f4236d515303871 /OpenSim/Services/HypergridService/UserAgentService.cs
parent* Add User Friendly Configuration File Exists check. If OpenSim.ini and eith... (diff)
parentAlmost, but not quite. Commenting verification again, until I understand wher... (diff)
downloadopensim-SC_OLD-019925bb2f87695cd16d1bebff4ef300b16e67f1.zip
opensim-SC_OLD-019925bb2f87695cd16d1bebff4ef300b16e67f1.tar.gz
opensim-SC_OLD-019925bb2f87695cd16d1bebff4ef300b16e67f1.tar.bz2
opensim-SC_OLD-019925bb2f87695cd16d1bebff4ef300b16e67f1.tar.xz
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Services/HypergridService/UserAgentService.cs')
-rw-r--r--OpenSim/Services/HypergridService/UserAgentService.cs19
1 files changed, 11 insertions, 8 deletions
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 64f7e8a..4a275c6 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -148,6 +148,15 @@ namespace OpenSim.Services.HypergridService
148 return true; 148 return true;
149 } 149 }
150 150
151 public void SetClientToken(UUID sessionID, string token)
152 {
153 if (m_TravelingAgents.ContainsKey(sessionID))
154 {
155 m_log.DebugFormat("[USER AGENT SERVICE]: Setting token {0} for session {1}", token, sessionID);
156 m_TravelingAgents[sessionID].ClientToken = token;
157 }
158 }
159
151 TravelingAgentInfo UpdateTravelInfo(AgentCircuitData agentCircuit, GridRegion region) 160 TravelingAgentInfo UpdateTravelInfo(AgentCircuitData agentCircuit, GridRegion region)
152 { 161 {
153 TravelingAgentInfo travel = new TravelingAgentInfo(); 162 TravelingAgentInfo travel = new TravelingAgentInfo();
@@ -203,21 +212,15 @@ namespace OpenSim.Services.HypergridService
203 212
204 public bool VerifyClient(UUID sessionID, string token) 213 public bool VerifyClient(UUID sessionID, string token)
205 { 214 {
215 m_log.DebugFormat("[USER AGENT SERVICE]: Verifying Client session {0} with token {1}", sessionID, token);
206 return true; 216 return true;
207 217
208 // 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
209 // info stays unchanged throughout a session 219 // info stays unchanged throughout a session
210 // 220 //
211 //if (m_TravelingAgents.ContainsKey(sessionID)) 221 //if (m_TravelingAgents.ContainsKey(sessionID))
212 //{
213 // // Aquiles heel. Must trust the first grid upon login
214 // if (m_TravelingAgents[sessionID].ClientToken == string.Empty)
215 // {
216 // m_TravelingAgents[sessionID].ClientToken = token;
217 // return true;
218 // }
219 // return m_TravelingAgents[sessionID].ClientToken == token; 222 // return m_TravelingAgents[sessionID].ClientToken == token;
220 //} 223
221 //return false; 224 //return false;
222 } 225 }
223 226