aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-05-04 19:15:44 +0000
committerJustin Clarke Casey2009-05-04 19:15:44 +0000
commitb3178c8079a4f8c0fe57af2fc9040d0667298ef0 (patch)
tree1a4137f014c70f6f25b7a2ffcd11927966b3a9f3 /OpenSim
parent* Initial infrastructure for ospa only uuid hashing of retrieved inventory items (diff)
downloadopensim-SC_OLD-b3178c8079a4f8c0fe57af2fc9040d0667298ef0.zip
opensim-SC_OLD-b3178c8079a4f8c0fe57af2fc9040d0667298ef0.tar.gz
opensim-SC_OLD-b3178c8079a4f8c0fe57af2fc9040d0667298ef0.tar.bz2
opensim-SC_OLD-b3178c8079a4f8c0fe57af2fc9040d0667298ef0.tar.xz
* Resolve http://opensimulator.org/mantis/view.php?id=3573
* Override add user for HG user services to hit local services if present
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/TemporaryUserProfilePlugin.cs4
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs4
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGUserServices.cs10
3 files changed, 14 insertions, 4 deletions
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
39 /// </summary> 39 /// </summary>
40 public class TemporaryUserProfilePlugin : IUserDataPlugin 40 public class TemporaryUserProfilePlugin : IUserDataPlugin
41 { 41 {
42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 42 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 43
44 protected Dictionary<UUID, UserProfileData> m_profiles = new Dictionary<UUID, UserProfileData>(); 44 protected Dictionary<UUID, UserProfileData> m_profiles = new Dictionary<UUID, UserProfileData>();
45 45
@@ -51,7 +51,7 @@ namespace OpenSim.Framework.Communications
51 51
52 public UserProfileData GetUserByUUID(UUID user) 52 public UserProfileData GetUserByUUID(UUID user)
53 { 53 {
54 m_log.DebugFormat("[TEMP USER PROFILE]: Received request for {0}", user); 54 //m_log.DebugFormat("[TEMP USER PROFILE]: Received request for {0}", user);
55 55
56 lock (m_profiles) 56 lock (m_profiles)
57 { 57 {
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
623 /// <param name="regX">location X</param> 623 /// <param name="regX">location X</param>
624 /// <param name="regY">location Y</param> 624 /// <param name="regY">location Y</param>
625 /// <returns>The UUID of the created user profile. On failure, returns UUID.Zero</returns> 625 /// <returns>The UUID of the created user profile. On failure, returns UUID.Zero</returns>
626 public UUID AddUser(string firstName, string lastName, string password, string email, uint regX, uint regY) 626 public virtual UUID AddUser(string firstName, string lastName, string password, string email, uint regX, uint regY)
627 { 627 {
628 return AddUser(firstName, lastName, password, email, regX, regY, UUID.Random()); 628 return AddUser(firstName, lastName, password, email, regX, regY, UUID.Random());
629 } 629 }
@@ -639,7 +639,7 @@ namespace OpenSim.Framework.Communications
639 /// <param name="regY">location Y</param> 639 /// <param name="regY">location Y</param>
640 /// <param name="SetUUID">UUID of avatar.</param> 640 /// <param name="SetUUID">UUID of avatar.</param>
641 /// <returns>The UUID of the created user profile. On failure, returns UUID.Zero</returns> 641 /// <returns>The UUID of the created user profile. On failure, returns UUID.Zero</returns>
642 public UUID AddUser( 642 public virtual UUID AddUser(
643 string firstName, string lastName, string password, string email, uint regX, uint regY, UUID SetUUID) 643 string firstName, string lastName, string password, string email, uint regX, uint regY, UUID SetUUID)
644 { 644 {
645 string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + String.Empty); 645 string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + String.Empty);
diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
index 8d9ca34..f2fee2f 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
@@ -62,6 +62,16 @@ namespace OpenSim.Region.Communications.Hypergrid
62 { 62 {
63 m_localUserServices = local; 63 m_localUserServices = local;
64 } 64 }
65
66 public override UUID AddUser(
67 string firstName, string lastName, string password, string email, uint regX, uint regY, UUID uuid)
68 {
69 // Only valid to create users locally
70 if (m_localUserServices != null)
71 return m_localUserServices.AddUser(firstName, lastName, password, email, regX, regY, uuid);
72
73 return UUID.Zero;
74 }
65 75
66 public override bool AddUserAgent(UserAgentData agentdata) 76 public override bool AddUserAgent(UserAgentData agentdata)
67 { 77 {