aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/LoginService.cs
diff options
context:
space:
mode:
authorSean Dague2008-04-10 14:09:30 +0000
committerSean Dague2008-04-10 14:09:30 +0000
commit25fea01b92a7682e10f57ce979217d31fee975ef (patch)
tree0e0dec2344cd06609bf47f1a7e2245a0a94f99c6 /OpenSim/Framework/Communications/LoginService.cs
parentmoved fields to properties for UserDataProfile, which was (diff)
downloadopensim-SC_OLD-25fea01b92a7682e10f57ce979217d31fee975ef.zip
opensim-SC_OLD-25fea01b92a7682e10f57ce979217d31fee975ef.tar.gz
opensim-SC_OLD-25fea01b92a7682e10f57ce979217d31fee975ef.tar.bz2
opensim-SC_OLD-25fea01b92a7682e10f57ce979217d31fee975ef.tar.xz
further renaming of properties for clarity
Diffstat (limited to 'OpenSim/Framework/Communications/LoginService.cs')
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index e5ad7a0..4f314bc 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -207,7 +207,7 @@ namespace OpenSim.Framework.UserManagement
207 207
208 try 208 try
209 { 209 {
210 LLUUID agentID = userProfile.Id; 210 LLUUID agentID = userProfile.ID;
211 211
212 // Inventory Library Section 212 // Inventory Library Section
213 InventoryData inventData = GetInventorySkeleton(agentID); 213 InventoryData inventData = GetInventorySkeleton(agentID);
@@ -349,7 +349,7 @@ namespace OpenSim.Framework.UserManagement
349 349
350 try 350 try
351 { 351 {
352 LLUUID agentID = userProfile.Id; 352 LLUUID agentID = userProfile.ID;
353 353
354 // Inventory Library Section 354 // Inventory Library Section
355 InventoryData inventData = GetInventorySkeleton(agentID); 355 InventoryData inventData = GetInventorySkeleton(agentID);
@@ -491,7 +491,7 @@ namespace OpenSim.Framework.UserManagement
491 if (goodweblogin) 491 if (goodweblogin)
492 { 492 {
493 LLUUID webloginkey = LLUUID.Random(); 493 LLUUID webloginkey = LLUUID.Random();
494 m_userManager.StoreWebLoginKey(user.Id, webloginkey); 494 m_userManager.StoreWebLoginKey(user.ID, webloginkey);
495 statuscode = 301; 495 statuscode = 301;
496 496
497 string redirectURL = "about:blank?redirect-http-hack=" + 497 string redirectURL = "about:blank?redirect-http-hack=" +
@@ -639,7 +639,7 @@ namespace OpenSim.Framework.UserManagement
639 public virtual bool AuthenticateUser(UserProfileData profile, string password) 639 public virtual bool AuthenticateUser(UserProfileData profile, string password)
640 { 640 {
641 bool passwordSuccess = false; 641 bool passwordSuccess = false;
642 m_log.InfoFormat("[LOGIN]: Authenticating {0} {1} ({2})", profile.FirstName, profile.SurName, profile.Id); 642 m_log.InfoFormat("[LOGIN]: Authenticating {0} {1} ({2})", profile.FirstName, profile.SurName, profile.ID);
643 643
644 // Web Login method seems to also occasionally send the hashed password itself 644 // Web Login method seems to also occasionally send the hashed password itself
645 645
@@ -664,7 +664,7 @@ namespace OpenSim.Framework.UserManagement
664 public virtual bool AuthenticateUser(UserProfileData profile, LLUUID webloginkey) 664 public virtual bool AuthenticateUser(UserProfileData profile, LLUUID webloginkey)
665 { 665 {
666 bool passwordSuccess = false; 666 bool passwordSuccess = false;
667 m_log.InfoFormat("[LOGIN]: Authenticating {0} {1} ({2})", profile.FirstName, profile.SurName, profile.Id); 667 m_log.InfoFormat("[LOGIN]: Authenticating {0} {1} ({2})", profile.FirstName, profile.SurName, profile.ID);
668 668
669 // Match web login key unless it's the default weblogin key LLUUID.Zero 669 // Match web login key unless it's the default weblogin key LLUUID.Zero
670 passwordSuccess = ((profile.WebLoginKey==webloginkey) && profile.WebLoginKey != LLUUID.Zero); 670 passwordSuccess = ((profile.WebLoginKey==webloginkey) && profile.WebLoginKey != LLUUID.Zero);