aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDiva Canto2013-07-02 17:03:04 -0700
committerDiva Canto2013-07-02 17:03:04 -0700
commit119f84fe11586f9abf76325e9466c8cd8f0d1a72 (patch)
tree973886370e366f88a5033a890ef3cf98e6fb488f /OpenSim/Region
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-119f84fe11586f9abf76325e9466c8cd8f0d1a72.zip
opensim-SC_OLD-119f84fe11586f9abf76325e9466c8cd8f0d1a72.tar.gz
opensim-SC_OLD-119f84fe11586f9abf76325e9466c8cd8f0d1a72.tar.bz2
opensim-SC_OLD-119f84fe11586f9abf76325e9466c8cd8f0d1a72.tar.xz
Squoosh one last opportunity for Unknown Users to creep in.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs12
1 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 90af82e..e19631e 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -532,7 +532,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
532 UserData user = new UserData(); 532 UserData user = new UserData();
533 user.Id = id; 533 user.Id = id;
534 534
535 if (creatorData != null && creatorData != string.Empty) 535 if (!string.IsNullOrEmpty(creatorData))
536 { 536 {
537 //creatorData = <endpoint>;<name> 537 //creatorData = <endpoint>;<name>
538 538
@@ -553,14 +553,12 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
553 } 553 }
554 if (parts.Length >= 2) 554 if (parts.Length >= 2)
555 user.FirstName = parts[1].Replace(' ', '.'); 555 user.FirstName = parts[1].Replace(' ', '.');
556
557 AddUserInternal(user);
558
556 } 559 }
557 else 560 // else don't add the user to the cache, period.
558 {
559 user.FirstName = "Unknown";
560 user.LastName = "UserUMMAU2";
561 }
562 561
563 AddUserInternal(user);
564 } 562 }
565 } 563 }
566 564