ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 02:36:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Fix hypergrid standalone login by overriding AddNewUserAgent in HGUserServices

Browse Source
This commit is contained in:
Justin Clarke Casey
2009-04-22 23:04:32 +00:00
parent 342126b7b9
commit bd8e4a8892
5 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/Communications/Services/HGLoginAuthService.cs
View File

@@ -61,7 +61,6 @@ namespace OpenSim.Framework.Communications.Services
/// </summary>
protected ILoginServiceToRegionsConnector m_regionsConnector;
public HGLoginAuthService(
UserManagerBase userManager, string welcomeMess,
IInterServiceInventoryServices interServiceInventoryService,
@@ -89,7 +88,7 @@ namespace OpenSim.Framework.Communications.Services
public override XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
{
m_log.Info("[HGLOGIN] HGLogin called " + request.MethodName);
m_log.Info("[HGLOGIN]: HGLogin called " + request.MethodName);
XmlRpcResponse response = base.XmlRpcLoginMethod(request);
Hashtable responseData = (Hashtable)response.Value;
@@ -135,7 +134,6 @@ namespace OpenSim.Framework.Communications.Services
public XmlRpcResponse XmlRpcGenerateKeyMethod(XmlRpcRequest request)
{
// Verify the key of who's calling
UUID userID = UUID.Zero;
UUID authKey = UUID.Zero;
@@ -254,7 +252,6 @@ namespace OpenSim.Framework.Communications.Services
return m_regionsConnector.RequestNeighbourInfo(homeRegionId);
}
/// <summary>
/// Not really informing the region. Just filling out the response fields related to the region.
/// </summary>

10
OpenSim/Framework/Communications/UserManagerBase.cs
View File

@@ -430,6 +430,8 @@ namespace OpenSim.Framework.Communications
/// <param name="request">The users loginrequest</param>
public void CreateAgent(UserProfileData profile, XmlRpcRequest request)
{
//m_log.DebugFormat("[USER MANAGER]: Creating agent {0} {1}", profile.Name, profile.ID);
UserAgentData agent = new UserAgentData();
// User connection
@@ -483,6 +485,8 @@ namespace OpenSim.Framework.Communications
public void CreateAgent(UserProfileData profile, OSD request)
{
//m_log.DebugFormat("[USER MANAGER]: Creating agent {0} {1}", profile.Name, profile.ID);
UserAgentData agent = new UserAgentData();
// User connection
@@ -538,6 +542,8 @@ namespace OpenSim.Framework.Communications
/// <returns>Successful?</returns>
public bool CommitAgent(ref UserProfileData profile)
{
//m_log.DebugFormat("[USER MANAGER]: Committing agent {0} {1}", profile.Name, profile.ID);
// TODO: how is this function different from setUserProfile? -> Add AddUserAgent() here and commit both tables "users" and "agents"
// TODO: what is the logic should be?
bool ret = false;
@@ -704,7 +710,7 @@ namespace OpenSim.Framework.Communications
/// Add agent to DB
/// </summary>
/// <param name="agentdata">The agent data to be added</param>
public bool AddUserAgent(UserAgentData agentdata)
public virtual bool AddUserAgent(UserAgentData agentdata)
{
foreach (IUserDataPlugin plugin in m_plugins)
{
@@ -845,7 +851,7 @@ namespace OpenSim.Framework.Communications
if (userProfile != null && userProfile.CurrentAgent != null)
{
m_log.DebugFormat("[USERAUTH]: Verifying session {0} for {1}; current session {2}", sessionID, userID, userProfile.CurrentAgent.SessionID);
m_log.DebugFormat("[USER AUTH]: Verifying session {0} for {1}; current session {2}", sessionID, userID, userProfile.CurrentAgent.SessionID);
if (userProfile.CurrentAgent.SessionID == sessionID)
{
return true;