diff options
author | Justin Clark-Casey (justincc) | 2013-09-17 00:02:36 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-09-20 21:39:20 +0100 |
commit | 7a142217543e7d1066d2d8f70a926483d0bf40a9 (patch) | |
tree | 550df485a35c75d62d70fd1471308595d762deba /OpenSim/Region/CoreModules/Framework/UserManagement | |
parent | Reinsert comments about possible race conditions when sending bulk inventory ... (diff) | |
download | opensim-SC_OLD-7a142217543e7d1066d2d8f70a926483d0bf40a9.zip opensim-SC_OLD-7a142217543e7d1066d2d8f70a926483d0bf40a9.tar.gz opensim-SC_OLD-7a142217543e7d1066d2d8f70a926483d0bf40a9.tar.bz2 opensim-SC_OLD-7a142217543e7d1066d2d8f70a926483d0bf40a9.tar.xz |
Fix issue in recent 3f0fa9f7 where the code start adding unknown user cache entries with no name
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/UserManagement')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index 25e8d69..63f78ac 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | |||
@@ -602,8 +602,11 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
602 | user.LastName = "@unknown"; | 602 | user.LastName = "@unknown"; |
603 | } | 603 | } |
604 | } | 604 | } |
605 | |||
605 | if (parts.Length >= 2) | 606 | if (parts.Length >= 2) |
606 | user.FirstName = parts[1].Replace(' ', '.'); | 607 | user.FirstName = parts[1].Replace(' ', '.'); |
608 | |||
609 | AddUserInternal(user); | ||
607 | } | 610 | } |
608 | 611 | ||
609 | // To avoid issues with clients, particularly Hypergrid ones, permanently caching | 612 | // To avoid issues with clients, particularly Hypergrid ones, permanently caching |
@@ -618,8 +621,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
618 | // user.FirstName = "Unknown"; | 621 | // user.FirstName = "Unknown"; |
619 | // user.LastName = "UserUMMAU4"; | 622 | // user.LastName = "UserUMMAU4"; |
620 | // } | 623 | // } |
621 | |||
622 | AddUserInternal(user); | ||
623 | } | 624 | } |
624 | } | 625 | } |
625 | 626 | ||