diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/Services/HGLoginAuthService.cs | 5 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/UserManagerBase.cs | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs b/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs index 5e357d5..b62e4a2 100644 --- a/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs +++ b/OpenSim/Framework/Communications/Services/HGLoginAuthService.cs | |||
@@ -61,7 +61,6 @@ namespace OpenSim.Framework.Communications.Services | |||
61 | /// </summary> | 61 | /// </summary> |
62 | protected ILoginServiceToRegionsConnector m_regionsConnector; | 62 | protected ILoginServiceToRegionsConnector m_regionsConnector; |
63 | 63 | ||
64 | |||
65 | public HGLoginAuthService( | 64 | public HGLoginAuthService( |
66 | UserManagerBase userManager, string welcomeMess, | 65 | UserManagerBase userManager, string welcomeMess, |
67 | IInterServiceInventoryServices interServiceInventoryService, | 66 | IInterServiceInventoryServices interServiceInventoryService, |
@@ -89,7 +88,7 @@ namespace OpenSim.Framework.Communications.Services | |||
89 | 88 | ||
90 | public override XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request) | 89 | public override XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request) |
91 | { | 90 | { |
92 | m_log.Info("[HGLOGIN] HGLogin called " + request.MethodName); | 91 | m_log.Info("[HGLOGIN]: HGLogin called " + request.MethodName); |
93 | XmlRpcResponse response = base.XmlRpcLoginMethod(request); | 92 | XmlRpcResponse response = base.XmlRpcLoginMethod(request); |
94 | Hashtable responseData = (Hashtable)response.Value; | 93 | Hashtable responseData = (Hashtable)response.Value; |
95 | 94 | ||
@@ -135,7 +134,6 @@ namespace OpenSim.Framework.Communications.Services | |||
135 | 134 | ||
136 | public XmlRpcResponse XmlRpcGenerateKeyMethod(XmlRpcRequest request) | 135 | public XmlRpcResponse XmlRpcGenerateKeyMethod(XmlRpcRequest request) |
137 | { | 136 | { |
138 | |||
139 | // Verify the key of who's calling | 137 | // Verify the key of who's calling |
140 | UUID userID = UUID.Zero; | 138 | UUID userID = UUID.Zero; |
141 | UUID authKey = UUID.Zero; | 139 | UUID authKey = UUID.Zero; |
@@ -254,7 +252,6 @@ namespace OpenSim.Framework.Communications.Services | |||
254 | return m_regionsConnector.RequestNeighbourInfo(homeRegionId); | 252 | return m_regionsConnector.RequestNeighbourInfo(homeRegionId); |
255 | } | 253 | } |
256 | 254 | ||
257 | |||
258 | /// <summary> | 255 | /// <summary> |
259 | /// Not really informing the region. Just filling out the response fields related to the region. | 256 | /// Not really informing the region. Just filling out the response fields related to the region. |
260 | /// </summary> | 257 | /// </summary> |
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index 2d0bf63..9cd7658 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs | |||
@@ -430,6 +430,8 @@ namespace OpenSim.Framework.Communications | |||
430 | /// <param name="request">The users loginrequest</param> | 430 | /// <param name="request">The users loginrequest</param> |
431 | public void CreateAgent(UserProfileData profile, XmlRpcRequest request) | 431 | public void CreateAgent(UserProfileData profile, XmlRpcRequest request) |
432 | { | 432 | { |
433 | //m_log.DebugFormat("[USER MANAGER]: Creating agent {0} {1}", profile.Name, profile.ID); | ||
434 | |||
433 | UserAgentData agent = new UserAgentData(); | 435 | UserAgentData agent = new UserAgentData(); |
434 | 436 | ||
435 | // User connection | 437 | // User connection |
@@ -483,6 +485,8 @@ namespace OpenSim.Framework.Communications | |||
483 | 485 | ||
484 | public void CreateAgent(UserProfileData profile, OSD request) | 486 | public void CreateAgent(UserProfileData profile, OSD request) |
485 | { | 487 | { |
488 | //m_log.DebugFormat("[USER MANAGER]: Creating agent {0} {1}", profile.Name, profile.ID); | ||
489 | |||
486 | UserAgentData agent = new UserAgentData(); | 490 | UserAgentData agent = new UserAgentData(); |
487 | 491 | ||
488 | // User connection | 492 | // User connection |
@@ -538,6 +542,8 @@ namespace OpenSim.Framework.Communications | |||
538 | /// <returns>Successful?</returns> | 542 | /// <returns>Successful?</returns> |
539 | public bool CommitAgent(ref UserProfileData profile) | 543 | public bool CommitAgent(ref UserProfileData profile) |
540 | { | 544 | { |
545 | //m_log.DebugFormat("[USER MANAGER]: Committing agent {0} {1}", profile.Name, profile.ID); | ||
546 | |||
541 | // TODO: how is this function different from setUserProfile? -> Add AddUserAgent() here and commit both tables "users" and "agents" | 547 | // TODO: how is this function different from setUserProfile? -> Add AddUserAgent() here and commit both tables "users" and "agents" |
542 | // TODO: what is the logic should be? | 548 | // TODO: what is the logic should be? |
543 | bool ret = false; | 549 | bool ret = false; |
@@ -704,7 +710,7 @@ namespace OpenSim.Framework.Communications | |||
704 | /// Add agent to DB | 710 | /// Add agent to DB |
705 | /// </summary> | 711 | /// </summary> |
706 | /// <param name="agentdata">The agent data to be added</param> | 712 | /// <param name="agentdata">The agent data to be added</param> |
707 | public bool AddUserAgent(UserAgentData agentdata) | 713 | public virtual bool AddUserAgent(UserAgentData agentdata) |
708 | { | 714 | { |
709 | foreach (IUserDataPlugin plugin in m_plugins) | 715 | foreach (IUserDataPlugin plugin in m_plugins) |
710 | { | 716 | { |
@@ -845,7 +851,7 @@ namespace OpenSim.Framework.Communications | |||
845 | 851 | ||
846 | if (userProfile != null && userProfile.CurrentAgent != null) | 852 | if (userProfile != null && userProfile.CurrentAgent != null) |
847 | { | 853 | { |
848 | m_log.DebugFormat("[USERAUTH]: Verifying session {0} for {1}; current session {2}", sessionID, userID, userProfile.CurrentAgent.SessionID); | 854 | m_log.DebugFormat("[USER AUTH]: Verifying session {0} for {1}; current session {2}", sessionID, userID, userProfile.CurrentAgent.SessionID); |
849 | if (userProfile.CurrentAgent.SessionID == sessionID) | 855 | if (userProfile.CurrentAgent.SessionID == sessionID) |
850 | { | 856 | { |
851 | return true; | 857 | return true; |