diff options
| author | Diva Canto | 2013-07-04 14:07:25 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-07-04 14:07:25 -0700 |
| commit | d80936bbbb85280623478f3a25d59a4a4da9c3e6 (patch) | |
| tree | af9d41361f7a3152923927a7edad49780bcf352c /OpenSim/Region/CoreModules | |
| parent | Debug the RegionHandle handler (same issue) (diff) | |
| download | opensim-SC_OLD-d80936bbbb85280623478f3a25d59a4a4da9c3e6.zip opensim-SC_OLD-d80936bbbb85280623478f3a25d59a4a4da9c3e6.tar.gz opensim-SC_OLD-d80936bbbb85280623478f3a25d59a4a4da9c3e6.tar.bz2 opensim-SC_OLD-d80936bbbb85280623478f3a25d59a4a4da9c3e6.tar.xz | |
Guard against completely unknown user UUIDs.
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index 461c385..a7cbc8f 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | |||
| @@ -332,10 +332,13 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
| 332 | { | 332 | { |
| 333 | AddUser(uuid, first, last, url); | 333 | AddUser(uuid, first, last, url); |
| 334 | 334 | ||
| 335 | names[0] = m_UserCache[uuid].FirstName; | 335 | if (m_UserCache.ContainsKey(uuid)) |
| 336 | names[1] = m_UserCache[uuid].LastName; | 336 | { |
| 337 | names[0] = m_UserCache[uuid].FirstName; | ||
| 338 | names[1] = m_UserCache[uuid].LastName; | ||
| 337 | 339 | ||
| 338 | return true; | 340 | return true; |
| 341 | } | ||
| 339 | } | 342 | } |
| 340 | else | 343 | else |
| 341 | m_log.DebugFormat("[USER MANAGEMENT MODULE]: Unable to parse UUI {0}", uInfo.UserID); | 344 | m_log.DebugFormat("[USER MANAGEMENT MODULE]: Unable to parse UUI {0}", uInfo.UserID); |