aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/HypergridService/UserAgentService.cs
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-05 19:07:37 +0000
committerMelanie Thielker2017-01-05 19:07:37 +0000
commitb16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch)
tree6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Services/HypergridService/UserAgentService.cs
parentMake it possible to disable the bakes module in the way it is described in co... (diff)
downloadopensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz
Massive tab and trailing space cleanup
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/HypergridService/UserAgentService.cs22
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index e701ec6..ba3cb2f 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -219,7 +219,7 @@ namespace OpenSim.Services.HypergridService
219 219
220 public bool LoginAgentToGrid(GridRegion source, AgentCircuitData agentCircuit, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason) 220 public bool LoginAgentToGrid(GridRegion source, AgentCircuitData agentCircuit, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason)
221 { 221 {
222 m_log.DebugFormat("[USER AGENT SERVICE]: Request to login user {0} {1} (@{2}) to grid {3}", 222 m_log.DebugFormat("[USER AGENT SERVICE]: Request to login user {0} {1} (@{2}) to grid {3}",
223 agentCircuit.firstname, agentCircuit.lastname, (fromLogin ? agentCircuit.IPAddress : "stored IP"), gatekeeper.ServerURI); 223 agentCircuit.firstname, agentCircuit.lastname, (fromLogin ? agentCircuit.IPAddress : "stored IP"), gatekeeper.ServerURI);
224 224
225 string gridName = gatekeeper.ServerURI; 225 string gridName = gatekeeper.ServerURI;
@@ -269,7 +269,7 @@ namespace OpenSim.Services.HypergridService
269 agentCircuit.ServiceSessionID = region.ServerURI + ";" + UUID.Random(); 269 agentCircuit.ServiceSessionID = region.ServerURI + ";" + UUID.Random();
270 TravelingAgentInfo old = null; 270 TravelingAgentInfo old = null;
271 TravelingAgentInfo travel = CreateTravelInfo(agentCircuit, region, fromLogin, out old); 271 TravelingAgentInfo travel = CreateTravelInfo(agentCircuit, region, fromLogin, out old);
272 272
273 bool success = false; 273 bool success = false;
274 string myExternalIP = string.Empty; 274 string myExternalIP = string.Empty;
275 275
@@ -288,7 +288,7 @@ namespace OpenSim.Services.HypergridService
288 288
289 if (!success) 289 if (!success)
290 { 290 {
291 m_log.DebugFormat("[USER AGENT SERVICE]: Unable to login user {0} {1} to grid {2}, reason: {3}", 291 m_log.DebugFormat("[USER AGENT SERVICE]: Unable to login user {0} {1} to grid {2}, reason: {3}",
292 agentCircuit.firstname, agentCircuit.lastname, region.ServerURI, reason); 292 agentCircuit.firstname, agentCircuit.lastname, region.ServerURI, reason);
293 293
294 if (old != null) 294 if (old != null)
@@ -301,11 +301,11 @@ namespace OpenSim.Services.HypergridService
301 301
302 // Everything is ok 302 // Everything is ok
303 303
304 if (!fromLogin) 304 if (!fromLogin)
305 { 305 {
306 // Update the perceived IP Address of our grid 306 // Update the perceived IP Address of our grid
307 m_log.DebugFormat("[USER AGENT SERVICE]: Gatekeeper sees me as {0}", myExternalIP); 307 m_log.DebugFormat("[USER AGENT SERVICE]: Gatekeeper sees me as {0}", myExternalIP);
308 } 308 }
309 309
310 travel.MyIpAddress = myExternalIP; 310 travel.MyIpAddress = myExternalIP;
311 311
@@ -376,7 +376,7 @@ namespace OpenSim.Services.HypergridService
376 if (m_BypassClientVerification) 376 if (m_BypassClientVerification)
377 return true; 377 return true;
378 378
379 m_log.DebugFormat("[USER AGENT SERVICE]: Verifying Client session {0} with reported IP {1}.", 379 m_log.DebugFormat("[USER AGENT SERVICE]: Verifying Client session {0} with reported IP {1}.",
380 sessionID, reportedIP); 380 sessionID, reportedIP);
381 381
382 HGTravelingData hgt = m_Database.Get(sessionID); 382 HGTravelingData hgt = m_Database.Get(sessionID);
@@ -535,7 +535,7 @@ namespace OpenSim.Services.HypergridService
535 FriendInfo[] friendInfos = m_FriendsService.GetFriends(localUserID); 535 FriendInfo[] friendInfos = m_FriendsService.GetFriends(localUserID);
536 foreach (FriendInfo finfo in friendInfos) 536 foreach (FriendInfo finfo in friendInfos)
537 { 537 {
538 if (finfo.Friend.StartsWith(foreignUserID.ToString()) && finfo.Friend.EndsWith(secret) && 538 if (finfo.Friend.StartsWith(foreignUserID.ToString()) && finfo.Friend.EndsWith(secret) &&
539 (finfo.TheirFlags & (int)FriendRights.CanSeeOnline) != 0 && (finfo.TheirFlags != -1)) 539 (finfo.TheirFlags & (int)FriendRights.CanSeeOnline) != 0 && (finfo.TheirFlags != -1))
540 { 540 {
541 // great! 541 // great!
@@ -641,7 +641,7 @@ namespace OpenSim.Services.HypergridService
641 foreach (FriendInfo f in friends) 641 foreach (FriendInfo f in friends)
642 if (f.Friend.StartsWith(targetUserID.ToString())) 642 if (f.Friend.StartsWith(targetUserID.ToString()))
643 { 643 {
644 // Let's remove the secret 644 // Let's remove the secret
645 UUID id; string tmp = string.Empty, secret = string.Empty; 645 UUID id; string tmp = string.Empty, secret = string.Empty;
646 if (Util.ParseUniversalUserIdentifier(f.Friend, out id, out tmp, out tmp, out tmp, out secret)) 646 if (Util.ParseUniversalUserIdentifier(f.Friend, out id, out tmp, out tmp, out tmp, out secret))
647 return f.Friend.Replace(secret, "0"); 647 return f.Friend.Replace(secret, "0");