aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
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/Region/Communications
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/Region/Communications')
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGUserServices.cs10
1 files changed, 10 insertions, 0 deletions
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 {