aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/UserManagerBase.cs
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/Framework/Communications/UserManagerBase.cs
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/Framework/Communications/UserManagerBase.cs')
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs10
1 files changed, 8 insertions, 2 deletions
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;