aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-04-22 23:04:32 +0000
committerJustin Clarke Casey2009-04-22 23:04:32 +0000
commitbd8e4a8892e204e2d9e7e24087f7200c16be57f0 (patch)
treec1d70399cd3f75a8bf97e09a9dcb8f652a1e8a3d /OpenSim/Region
parent* Resolve http://opensimulator.org/mantis/view.php?id=3509 by putting some se... (diff)
downloadopensim-SC_OLD-bd8e4a8892e204e2d9e7e24087f7200c16be57f0.zip
opensim-SC_OLD-bd8e4a8892e204e2d9e7e24087f7200c16be57f0.tar.gz
opensim-SC_OLD-bd8e4a8892e204e2d9e7e24087f7200c16be57f0.tar.bz2
opensim-SC_OLD-bd8e4a8892e204e2d9e7e24087f7200c16be57f0.tar.xz
* Fix hypergrid standalone login by overriding AddNewUserAgent in HGUserServices
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGUserServices.cs21
-rw-r--r--OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs13
2 files changed, 18 insertions, 16 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
index 93d5434..8d9ca34 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
@@ -62,12 +62,15 @@ namespace OpenSim.Region.Communications.Hypergrid
62 { 62 {
63 m_localUserServices = local; 63 m_localUserServices = local;
64 } 64 }
65
66 public override bool AddUserAgent(UserAgentData agentdata)
67 {
68 if (m_localUserServices != null)
69 return m_localUserServices.AddUserAgent(agentdata);
70
71 return base.AddUserAgent(agentdata);
72 }
65 73
66 /// <summary>
67 /// Get a user agent from the user server
68 /// </summary>
69 /// <param name="avatarID"></param>
70 /// <returns>null if the request fails</returns>
71 public override UserAgentData GetAgentByUUID(UUID userId) 74 public override UserAgentData GetAgentByUUID(UUID userId)
72 { 75 {
73 string url = string.Empty; 76 string url = string.Empty;
@@ -77,14 +80,6 @@ namespace OpenSim.Region.Communications.Hypergrid
77 return base.GetAgentByUUID(userId); 80 return base.GetAgentByUUID(userId);
78 } 81 }
79 82
80 /// <summary>
81 /// Logs off a user on the user server
82 /// </summary>
83 /// <param name="UserID">UUID of the user</param>
84 /// <param name="regionID">UUID of the Region</param>
85 /// <param name="regionhandle">regionhandle</param>
86 /// <param name="position">final position</param>
87 /// <param name="lookat">final lookat</param>
88 public override void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, Vector3 position, Vector3 lookat) 83 public override void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, Vector3 position, Vector3 lookat)
89 { 84 {
90 string url = string.Empty; 85 string url = string.Empty;
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
index c458b89..2c7ba93 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
@@ -54,7 +54,6 @@ namespace OpenSim.Region.CoreModules.Hypergrid
54 54
55 protected bool m_enabled = false; // Module is only enabled if running in standalone mode 55 protected bool m_enabled = false; // Module is only enabled if running in standalone mode
56 56
57
58 public bool RegionLoginsEnabled 57 public bool RegionLoginsEnabled
59 { 58 {
60 get 59 get
@@ -88,7 +87,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
88 87
89 if (m_enabled) 88 if (m_enabled)
90 { 89 {
91 m_log.Debug("[HGLogin] HGlogin module enabled"); 90 m_log.Debug("[HGLogin]: HGlogin module enabled");
92 bool authenticate = true; 91 bool authenticate = true;
93 string welcomeMessage = "Welcome to OpenSim"; 92 string welcomeMessage = "Welcome to OpenSim";
94 IConfig standaloneConfig = source.Configs["StandAlone"]; 93 IConfig standaloneConfig = source.Configs["StandAlone"];
@@ -104,7 +103,15 @@ namespace OpenSim.Region.CoreModules.Hypergrid
104 IHttpServer httpServer = m_firstScene.CommsManager.HttpServer; 103 IHttpServer httpServer = m_firstScene.CommsManager.HttpServer;
105 104
106 //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference 105 //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference
107 m_loginService = new HGLoginAuthService((UserManagerBase)m_firstScene.CommsManager.UserAdminService, welcomeMessage, m_firstScene.CommsManager.InterServiceInventoryService, m_firstScene.CommsManager.NetworkServersInfo, authenticate, rootFolder, this); 106 m_loginService
107 = new HGLoginAuthService(
108 (UserManagerBase)m_firstScene.CommsManager.UserAdminService,
109 welcomeMessage,
110 m_firstScene.CommsManager.InterServiceInventoryService,
111 m_firstScene.CommsManager.NetworkServersInfo,
112 authenticate,
113 rootFolder,
114 this);
108 115
109 httpServer.AddXmlRPCHandler("hg_login", m_loginService.XmlRpcLoginMethod); 116 httpServer.AddXmlRPCHandler("hg_login", m_loginService.XmlRpcLoginMethod);
110 httpServer.AddXmlRPCHandler("hg_new_auth_key", m_loginService.XmlRpcGenerateKeyMethod); 117 httpServer.AddXmlRPCHandler("hg_new_auth_key", m_loginService.XmlRpcGenerateKeyMethod);