aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MSSQL/MSSQLGridData.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/Data/MSSQL/MSSQLGridData.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/Data/MSSQL/MSSQLGridData.cs')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLGridData.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs
index 423d4aa..47edc4b 100644
--- a/OpenSim/Data/MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridData.cs
@@ -31,7 +31,7 @@ using System.Data;
31using System.Reflection; 31using System.Reflection;
32using System.Security.Cryptography; 32using System.Security.Cryptography;
33using System.Text; 33using System.Text;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36using OpenSim.Framework; 36using OpenSim.Framework;
37 37
@@ -176,7 +176,7 @@ namespace OpenSim.Data.MSSQL
176 /// </summary> 176 /// </summary>
177 /// <param name="uuid">The region UUID</param> 177 /// <param name="uuid">The region UUID</param>
178 /// <returns>The sim profile</returns> 178 /// <returns>The sim profile</returns>
179 override public RegionProfileData GetProfileByLLUUID(LLUUID uuid) 179 override public RegionProfileData GetProfileByUUID(UUID uuid)
180 { 180 {
181 Dictionary<string, string> param = new Dictionary<string, string>(); 181 Dictionary<string, string> param = new Dictionary<string, string>();
182 param["uuid"] = uuid.ToString(); 182 param["uuid"] = uuid.ToString();
@@ -284,7 +284,7 @@ namespace OpenSim.Data.MSSQL
284 284
285 parameters["regionHandle"] = profile.regionHandle.ToString(); 285 parameters["regionHandle"] = profile.regionHandle.ToString();
286 parameters["regionName"] = profile.regionName; 286 parameters["regionName"] = profile.regionName;
287 parameters["uuid"] = profile.UUID.ToString(); 287 parameters["uuid"] = profile.ToString();
288 parameters["regionRecvKey"] = profile.regionRecvKey; 288 parameters["regionRecvKey"] = profile.regionRecvKey;
289 parameters["regionSecret"] = profile.regionSecret; 289 parameters["regionSecret"] = profile.regionSecret;
290 parameters["regionSendKey"] = profile.regionSendKey; 290 parameters["regionSendKey"] = profile.regionSendKey;
@@ -352,7 +352,7 @@ namespace OpenSim.Data.MSSQL
352 352
353 parameters["regionHandle"] = profile.regionHandle.ToString(); 353 parameters["regionHandle"] = profile.regionHandle.ToString();
354 parameters["regionName"] = profile.regionName; 354 parameters["regionName"] = profile.regionName;
355 parameters["uuid"] = profile.UUID.ToString(); 355 parameters["uuid"] = profile.ToString();
356 parameters["regionRecvKey"] = profile.regionRecvKey; 356 parameters["regionRecvKey"] = profile.regionRecvKey;
357 parameters["regionSecret"] = profile.regionSecret; 357 parameters["regionSecret"] = profile.regionSecret;
358 parameters["regionSendKey"] = profile.regionSendKey; 358 parameters["regionSendKey"] = profile.regionSendKey;
@@ -403,14 +403,14 @@ namespace OpenSim.Data.MSSQL
403 /// <param name="handle">The attempted regionHandle of the challenger</param> 403 /// <param name="handle">The attempted regionHandle of the challenger</param>
404 /// <param name="authkey">The secret</param> 404 /// <param name="authkey">The secret</param>
405 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns> 405 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
406 override public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey) 406 override public bool AuthenticateSim(UUID uuid, ulong handle, string authkey)
407 { 407 {
408 bool throwHissyFit = false; // Should be true by 1.0 408 bool throwHissyFit = false; // Should be true by 1.0
409 409
410 if (throwHissyFit) 410 if (throwHissyFit)
411 throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential."); 411 throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");
412 412
413 RegionProfileData data = GetProfileByLLUUID(uuid); 413 RegionProfileData data = GetProfileByUUID(uuid);
414 414
415 return (handle == data.regionHandle && authkey == data.regionSecret); 415 return (handle == data.regionHandle && authkey == data.regionSecret);
416 } 416 }
@@ -424,7 +424,7 @@ namespace OpenSim.Data.MSSQL
424 /// <param name="authhash"></param> 424 /// <param name="authhash"></param>
425 /// <param name="challenge"></param> 425 /// <param name="challenge"></param>
426 /// <returns></returns> 426 /// <returns></returns>
427 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge) 427 public bool AuthenticateSim(UUID uuid, ulong handle, string authhash, string challenge)
428 { 428 {
429 // SHA512Managed HashProvider = new SHA512Managed(); 429 // SHA512Managed HashProvider = new SHA512Managed();
430 // Encoding TextProvider = new UTF8Encoding(); 430 // Encoding TextProvider = new UTF8Encoding();