aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/LoginService.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 07:52:41 +0000
committerTeravus Ovares2008-09-06 07:52:41 +0000
commit7d89e122930be39e84a6d174548fa2d12ac0484a (patch)
treee5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Framework/Communications/LoginService.cs
parent* minor: speculatively try a change to bamboo.build to see if this generates ... (diff)
downloadopensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to 'OpenSim/Framework/Communications/LoginService.cs')
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs28
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 73fba1e..d8d0fa2 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -33,8 +33,8 @@ using System.Reflection;
33using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
34using System.Threading; 34using System.Threading;
35using System.Web; 35using System.Web;
36using libsecondlife; 36using OpenMetaverse;
37using libsecondlife.StructuredData; 37using OpenMetaverse.StructuredData;
38using log4net; 38using log4net;
39using Nwc.XmlRpc; 39using Nwc.XmlRpc;
40using OpenSim.Framework.Communications.Cache; 40using OpenSim.Framework.Communications.Cache;
@@ -94,7 +94,7 @@ namespace OpenSim.Framework.Communications
94 /// <param name="userID"></param> 94 /// <param name="userID"></param>
95 /// <returns></returns> 95 /// <returns></returns>
96 /// <exception cref='System.Exception'>This will be thrown if there is a problem with the inventory service</exception> 96 /// <exception cref='System.Exception'>This will be thrown if there is a problem with the inventory service</exception>
97 protected abstract InventoryData GetInventorySkeleton(LLUUID userID); 97 protected abstract InventoryData GetInventorySkeleton(UUID userID);
98 98
99 /// <summary> 99 /// <summary>
100 /// Called when we receive the client's initial XMLRPC login_to_simulator request message 100 /// Called when we receive the client's initial XMLRPC login_to_simulator request message
@@ -163,10 +163,10 @@ namespace OpenSim.Framework.Communications
163 } 163 }
164 else if (requestData.Contains("web_login_key")) 164 else if (requestData.Contains("web_login_key"))
165 { 165 {
166 LLUUID webloginkey = null; 166 UUID webloginkey = null;
167 try 167 try
168 { 168 {
169 webloginkey = new LLUUID((string)requestData["web_login_key"]); 169 webloginkey = new UUID((string)requestData["web_login_key"]);
170 } 170 }
171 catch (Exception e) 171 catch (Exception e)
172 { 172 {
@@ -227,7 +227,7 @@ namespace OpenSim.Framework.Communications
227 227
228 try 228 try
229 { 229 {
230 LLUUID agentID = userProfile.ID; 230 UUID agentID = userProfile.ID;
231 InventoryData inventData = null; 231 InventoryData inventData = null;
232 232
233 try 233 try
@@ -400,7 +400,7 @@ namespace OpenSim.Framework.Communications
400 400
401 try 401 try
402 { 402 {
403 LLUUID agentID = userProfile.ID; 403 UUID agentID = userProfile.ID;
404 404
405 //InventoryData inventData = GetInventorySkeleton(agentID); 405 //InventoryData inventData = GetInventorySkeleton(agentID);
406 InventoryData inventData = null; 406 InventoryData inventData = null;
@@ -566,7 +566,7 @@ namespace OpenSim.Framework.Communications
566 566
567 if (goodweblogin) 567 if (goodweblogin)
568 { 568 {
569 LLUUID webloginkey = LLUUID.Random(); 569 UUID webloginkey = UUID.Random();
570 m_userManager.StoreWebLoginKey(user.ID, webloginkey); 570 m_userManager.StoreWebLoginKey(user.ID, webloginkey);
571 statuscode = 301; 571 statuscode = 301;
572 572
@@ -737,13 +737,13 @@ namespace OpenSim.Framework.Communications
737 return passwordSuccess; 737 return passwordSuccess;
738 } 738 }
739 739
740 public virtual bool AuthenticateUser(UserProfileData profile, LLUUID webloginkey) 740 public virtual bool AuthenticateUser(UserProfileData profile, UUID webloginkey)
741 { 741 {
742 bool passwordSuccess = false; 742 bool passwordSuccess = false;
743 m_log.InfoFormat("[LOGIN]: Authenticating {0} {1} ({2})", profile.FirstName, profile.SurName, profile.ID); 743 m_log.InfoFormat("[LOGIN]: Authenticating {0} {1} ({2})", profile.FirstName, profile.SurName, profile.ID);
744 744
745 // Match web login key unless it's the default weblogin key LLUUID.Zero 745 // Match web login key unless it's the default weblogin key UUID.Zero
746 passwordSuccess = ((profile.WebLoginKey==webloginkey) && profile.WebLoginKey != LLUUID.Zero); 746 passwordSuccess = ((profile.WebLoginKey==webloginkey) && profile.WebLoginKey != UUID.Zero);
747 747
748 return passwordSuccess; 748 return passwordSuccess;
749 } 749 }
@@ -803,7 +803,7 @@ namespace OpenSim.Framework.Communications
803 /// <returns></returns> 803 /// <returns></returns>
804 protected virtual ArrayList GetInventoryLibrary() 804 protected virtual ArrayList GetInventoryLibrary()
805 { 805 {
806 Dictionary<LLUUID, InventoryFolderImpl> rootFolders 806 Dictionary<UUID, InventoryFolderImpl> rootFolders
807 = m_libraryRootFolder.RequestSelfAndDescendentFolders(); 807 = m_libraryRootFolder.RequestSelfAndDescendentFolders();
808 ArrayList folderHashes = new ArrayList(); 808 ArrayList folderHashes = new ArrayList();
809 809
@@ -838,9 +838,9 @@ namespace OpenSim.Framework.Communications
838 public class InventoryData 838 public class InventoryData
839 { 839 {
840 public ArrayList InventoryArray = null; 840 public ArrayList InventoryArray = null;
841 public LLUUID RootFolderID = LLUUID.Zero; 841 public UUID RootFolderID = UUID.Zero;
842 842
843 public InventoryData(ArrayList invList, LLUUID rootID) 843 public InventoryData(ArrayList invList, UUID rootID)
844 { 844 {
845 InventoryArray = invList; 845 InventoryArray = invList;
846 RootFolderID = rootID; 846 RootFolderID = rootID;