From b3178c8079a4f8c0fe57af2fc9040d0667298ef0 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Mon, 4 May 2009 19:15:44 +0000 Subject: * Resolve http://opensimulator.org/mantis/view.php?id=3573 * Override add user for HG user services to hit local services if present --- OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs | 4 ++-- OpenSim/Framework/Communications/UserManagerBase.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'OpenSim/Framework') diff --git a/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs b/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs index ba14790..2e355cd 100644 --- a/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs +++ b/OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs @@ -39,7 +39,7 @@ namespace OpenSim.Framework.Communications /// public class TemporaryUserProfilePlugin : IUserDataPlugin { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); protected Dictionary m_profiles = new Dictionary(); @@ -51,7 +51,7 @@ namespace OpenSim.Framework.Communications public UserProfileData GetUserByUUID(UUID user) { - m_log.DebugFormat("[TEMP USER PROFILE]: Received request for {0}", user); + //m_log.DebugFormat("[TEMP USER PROFILE]: Received request for {0}", user); lock (m_profiles) { diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index 133f810..50f57e1 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs @@ -623,7 +623,7 @@ namespace OpenSim.Framework.Communications /// location X /// location Y /// The UUID of the created user profile. On failure, returns UUID.Zero - public UUID AddUser(string firstName, string lastName, string password, string email, uint regX, uint regY) + public virtual UUID AddUser(string firstName, string lastName, string password, string email, uint regX, uint regY) { return AddUser(firstName, lastName, password, email, regX, regY, UUID.Random()); } @@ -639,7 +639,7 @@ namespace OpenSim.Framework.Communications /// location Y /// UUID of avatar. /// The UUID of the created user profile. On failure, returns UUID.Zero - public UUID AddUser( + public virtual UUID AddUser( string firstName, string lastName, string password, string email, uint regX, uint regY, UUID SetUUID) { string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + String.Empty); -- cgit v1.1