aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-09-17 01:20:55 +0100
committerJustin Clark-Casey (justincc)2013-09-20 21:39:30 +0100
commitb1d43d46bf11eab4295a41450278245544648e66 (patch)
treeb9679f3935466449ac313d07f28443a47906821c /OpenSim/Region
parentComment out warning about no grid user found in UMM.TryGetUserNamesFromServic... (diff)
downloadopensim-SC_OLD-b1d43d46bf11eab4295a41450278245544648e66.zip
opensim-SC_OLD-b1d43d46bf11eab4295a41450278245544648e66.tar.gz
opensim-SC_OLD-b1d43d46bf11eab4295a41450278245544648e66.tar.bz2
opensim-SC_OLD-b1d43d46bf11eab4295a41450278245544648e66.tar.xz
Reinstate insertion of "Unknown UserUMMAU4" now, as naive removing may be generating too many repeating user requests from other sources.
Leaves in the dropping of the client GUN8 (now 9) uuid binding message, since this was the much more common case from the viewer-side and this can only affect viewers.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs66
1 files changed, 31 insertions, 35 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 80b6ac1..bb2bbe3 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -388,10 +388,10 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
388 else 388 else
389 m_log.DebugFormat("[USER MANAGEMENT MODULE]: Unable to parse UUI {0}", uInfo.UserID); 389 m_log.DebugFormat("[USER MANAGEMENT MODULE]: Unable to parse UUI {0}", uInfo.UserID);
390 } 390 }
391// else 391 else
392// { 392 {
393// m_log.DebugFormat("[USER MANAGEMENT MODULE]: No grid user found for {0}", uuid); 393 m_log.DebugFormat("[USER MANAGEMENT MODULE]: No grid user found for {0}", uuid);
394// } 394 }
395 395
396 names[0] = "Unknown"; 396 names[0] = "Unknown";
397 names[1] = "UserUMMTGUN9"; 397 names[1] = "UserUMMTGUN9";
@@ -552,24 +552,24 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
552 552
553 if (oldUser != null) 553 if (oldUser != null)
554 { 554 {
555// if (creatorData == null || creatorData == String.Empty) 555 if (creatorData == null || creatorData == String.Empty)
556// { 556 {
557// //ignore updates without creator data 557 //ignore updates without creator data
558// return; 558 return;
559// } 559 }
560// 560
561// //try update unknown users, but don't update anyone else 561 //try update unknown users, but don't update anyone else
562// if (oldUser.FirstName == "Unknown" && !creatorData.Contains("Unknown")) 562 if (oldUser.FirstName == "Unknown" && !creatorData.Contains("Unknown"))
563// { 563 {
564// lock (m_UserCache) 564 lock (m_UserCache)
565// m_UserCache.Remove(id); 565 m_UserCache.Remove(id);
566// m_log.DebugFormat("[USER MANAGEMENT MODULE]: Re-adding user with id {0}, creatorData [{1}] and old HomeURL {2}", id, creatorData, oldUser.HomeURL); 566 m_log.DebugFormat("[USER MANAGEMENT MODULE]: Re-adding user with id {0}, creatorData [{1}] and old HomeURL {2}", id, creatorData, oldUser.HomeURL);
567// } 567 }
568// else 568 else
569// { 569 {
570 //we have already a valid user within the cache 570 //we have already a valid user within the cache
571 return; 571 return;
572// } 572 }
573 } 573 }
574 574
575 UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, id); 575 UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, id);
@@ -605,22 +605,18 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
605 605
606 if (parts.Length >= 2) 606 if (parts.Length >= 2)
607 user.FirstName = parts[1].Replace(' ', '.'); 607 user.FirstName = parts[1].Replace(' ', '.');
608
609 AddUserInternal(user);
610 } 608 }
611 609 else
612 // To avoid issues with clients, particularly Hypergrid ones, permanently caching 610 {
613 // UUID -> "Unknown User" name bindings, elsewhere we will drop such requests rather than replying. 611 // Temporarily add unknown user entries of this type into the cache so that we can distinguish
614 // This also means that we cannot add an unknown user binding to the cache here. 612 // this source from other recent (hopefully resolved) bugs that fail to retrieve a user name binding
615// else 613 // TODO: Can be removed when GUN* unknown users have definitely dropped significantly or
616// { 614 // disappeared.
617// // Temporarily add unknown user entries of this type into the cache so that we can distinguish 615 user.FirstName = "Unknown";
618// // this source from other recent (hopefully resolved) bugs that fail to retrieve a user name binding 616 user.LastName = "UserUMMAU4";
619// // TODO: Can be removed when GUN* unknown users have definitely dropped significantly or 617 }
620// // disappeared. 618
621// user.FirstName = "Unknown"; 619 AddUserInternal(user);
622// user.LastName = "UserUMMAU4";
623// }
624 } 620 }
625 } 621 }
626 622