diff options
author | Justin Clark-Casey (justincc) | 2013-07-04 20:39:16 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-07-04 20:39:16 +0100 |
commit | fdafc2a16c3c661231d47f0c979438f2500ec131 (patch) | |
tree | 8ac4f6c23812baf1b1b74f4351ee7a1590268ec7 /OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-fdafc2a16c3c661231d47f0c979438f2500ec131.zip opensim-SC_OLD-fdafc2a16c3c661231d47f0c979438f2500ec131.tar.gz opensim-SC_OLD-fdafc2a16c3c661231d47f0c979438f2500ec131.tar.bz2 opensim-SC_OLD-fdafc2a16c3c661231d47f0c979438f2500ec131.tar.xz |
With diva's permission, temporarily reinsert Unknown UserUMMAU3 to make sure that GUN7 failure has largely disappeared.
Unknown UserUMMAU3 insertion should definitely be removed down the line.
However, I would like a little more time to check the GUN* reduction first, since removing UMMAU3 will make these failures appear as GUN7 instead.
Also bumps GUN6 -> GUN7 and UMMAU2 -> UMMAU3
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index e19631e..461c385 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | |||
@@ -135,7 +135,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
135 | s.ForEachSOG(delegate(SceneObjectGroup sog) { CacheCreators(sog); }); | 135 | s.ForEachSOG(delegate(SceneObjectGroup sog) { CacheCreators(sog); }); |
136 | } | 136 | } |
137 | 137 | ||
138 | |||
139 | void EventManager_OnNewClient(IClientAPI client) | 138 | void EventManager_OnNewClient(IClientAPI client) |
140 | { | 139 | { |
141 | client.OnConnectionClosed += new Action<IClientAPI>(HandleConnectionClosed); | 140 | client.OnConnectionClosed += new Action<IClientAPI>(HandleConnectionClosed); |
@@ -151,6 +150,10 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
151 | 150 | ||
152 | void HandleUUIDNameRequest(UUID uuid, IClientAPI remote_client) | 151 | void HandleUUIDNameRequest(UUID uuid, IClientAPI remote_client) |
153 | { | 152 | { |
153 | // m_log.DebugFormat( | ||
154 | // "[USER MANAGEMENT MODULE]: Handling request for name binding of UUID {0} from {1}", | ||
155 | // uuid, remote_client.Name); | ||
156 | |||
154 | if (m_Scenes[0].LibraryService != null && (m_Scenes[0].LibraryService.LibraryRootFolder.Owner == uuid)) | 157 | if (m_Scenes[0].LibraryService != null && (m_Scenes[0].LibraryService.LibraryRootFolder.Owner == uuid)) |
155 | { | 158 | { |
156 | remote_client.SendNameReply(uuid, "Mr", "OpenSim"); | 159 | remote_client.SendNameReply(uuid, "Mr", "OpenSim"); |
@@ -338,10 +341,12 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
338 | m_log.DebugFormat("[USER MANAGEMENT MODULE]: Unable to parse UUI {0}", uInfo.UserID); | 341 | m_log.DebugFormat("[USER MANAGEMENT MODULE]: Unable to parse UUI {0}", uInfo.UserID); |
339 | } | 342 | } |
340 | else | 343 | else |
341 | m_log.DebugFormat("[USER MANAGEMENT MODULE]: No grid user found {0}", uuid); | 344 | { |
345 | m_log.DebugFormat("[USER MANAGEMENT MODULE]: No grid user found for {0}", uuid); | ||
346 | } | ||
342 | 347 | ||
343 | names[0] = "Unknown"; | 348 | names[0] = "Unknown"; |
344 | names[1] = "UserUMMTGUN6"; | 349 | names[1] = "UserUMMTGUN7"; |
345 | 350 | ||
346 | return false; | 351 | return false; |
347 | } | 352 | } |
@@ -553,12 +558,18 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
553 | } | 558 | } |
554 | if (parts.Length >= 2) | 559 | if (parts.Length >= 2) |
555 | user.FirstName = parts[1].Replace(' ', '.'); | 560 | user.FirstName = parts[1].Replace(' ', '.'); |
556 | |||
557 | AddUserInternal(user); | ||
558 | |||
559 | } | 561 | } |
560 | // else don't add the user to the cache, period. | 562 | else |
563 | { | ||
564 | // Temporarily add unknown user entries of this type into the cache so that we can distinguish | ||
565 | // this source from other recent (hopefully resolved) bugs that fail to retrieve a user name binding | ||
566 | // TODO: Can be removed when GUN* unknown users have definitely dropped significantly or | ||
567 | // disappeared. | ||
568 | user.FirstName = "Unknown"; | ||
569 | user.LastName = "UserUMMAU3"; | ||
570 | } | ||
561 | 571 | ||
572 | AddUserInternal(user); | ||
562 | } | 573 | } |
563 | } | 574 | } |
564 | 575 | ||