aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDiva Canto2013-07-24 11:26:30 -0700
committerDiva Canto2013-07-24 11:26:30 -0700
commit665fb666862ba15dc275f0d6b506970bac8015da (patch)
treee60128d14ae01a0e2547fad3e75aec30a8716648 /OpenSim/Region
parentAdded config var that we all thought was already there: see_into_region. (Not... (diff)
parentFor unknown user issue, bump GUN7 to GUN8 and UMMAU3 to UMMAU4 to assess what... (diff)
downloadopensim-SC_OLD-665fb666862ba15dc275f0d6b506970bac8015da.zip
opensim-SC_OLD-665fb666862ba15dc275f0d6b506970bac8015da.tar.gz
opensim-SC_OLD-665fb666862ba15dc275f0d6b506970bac8015da.tar.bz2
opensim-SC_OLD-665fb666862ba15dc275f0d6b506970bac8015da.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index a91adfa..53bd2e2 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -389,7 +389,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
389 } 389 }
390 390
391 names[0] = "Unknown"; 391 names[0] = "Unknown";
392 names[1] = "UserUMMTGUN7"; 392 names[1] = "UserUMMTGUN8";
393 393
394 return false; 394 return false;
395 } 395 }
@@ -601,7 +601,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
601 // TODO: Can be removed when GUN* unknown users have definitely dropped significantly or 601 // TODO: Can be removed when GUN* unknown users have definitely dropped significantly or
602 // disappeared. 602 // disappeared.
603 user.FirstName = "Unknown"; 603 user.FirstName = "Unknown";
604 user.LastName = "UserUMMAU3"; 604 user.LastName = "UserUMMAU4";
605 } 605 }
606 606
607 AddUserInternal(user); 607 AddUserInternal(user);