aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-09-23 22:36:20 +0100
committerJustin Clark-Casey (justincc)2011-09-23 22:36:20 +0100
commit8c4dd6b3302a142c6ac7578cc5012049c51610ed (patch)
tree75540bc841ed9588479c64d2cffd116130afd928 /OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
parentUse a copy of the inventory items list to register users in the thread starte... (diff)
parentremove unused SOP.Create() method (diff)
downloadopensim-SC_OLD-8c4dd6b3302a142c6ac7578cc5012049c51610ed.zip
opensim-SC_OLD-8c4dd6b3302a142c6ac7578cc5012049c51610ed.tar.gz
opensim-SC_OLD-8c4dd6b3302a142c6ac7578cc5012049c51610ed.tar.bz2
opensim-SC_OLD-8c4dd6b3302a142c6ac7578cc5012049c51610ed.tar.xz
Merge branch 'master' into 0.7.2-post-fixes
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index f7003db..bef0d69 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -363,9 +363,9 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
363 lock (m_UserCache) 363 lock (m_UserCache)
364 m_UserCache[user.Id] = user; 364 m_UserCache[user.Id] = user;
365 365
366 m_log.DebugFormat( 366// m_log.DebugFormat(
367 "[USER MANAGEMENT MODULE]: Added user {0} {1} {2} {3}", 367// "[USER MANAGEMENT MODULE]: Added user {0} {1} {2} {3}",
368 user.Id, user.FirstName, user.LastName, user.HomeURL); 368// user.Id, user.FirstName, user.LastName, user.HomeURL);
369 } 369 }
370 370
371 //public void AddUser(UUID uuid, string userData) 371 //public void AddUser(UUID uuid, string userData)