From 7d89e122930be39e84a6d174548fa2d12ac0484a Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sat, 6 Sep 2008 07:52:41 +0000
Subject: * 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.
---
OpenSim/Data/SQLite/SQLiteGridData.cs | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'OpenSim/Data/SQLite/SQLiteGridData.cs')
diff --git a/OpenSim/Data/SQLite/SQLiteGridData.cs b/OpenSim/Data/SQLite/SQLiteGridData.cs
index 8c4574e..f715c0e 100644
--- a/OpenSim/Data/SQLite/SQLiteGridData.cs
+++ b/OpenSim/Data/SQLite/SQLiteGridData.cs
@@ -31,7 +31,7 @@ using System.Data;
using System.Reflection;
using System.Security.Cryptography;
using System.Text;
-using libsecondlife;
+using OpenMetaverse;
using log4net;
using OpenSim.Framework;
@@ -162,7 +162,7 @@ namespace OpenSim.Data.SQLite
///
/// The region UUID
/// The sim profile
- override public RegionProfileData GetProfileByLLUUID(LLUUID uuid)
+ override public RegionProfileData GetProfileByUUID(UUID uuid)
{
Dictionary param = new Dictionary();
param["uuid"] = uuid.ToString();
@@ -181,7 +181,7 @@ namespace OpenSim.Data.SQLite
/// Returns a list of avatar and UUIDs that match the query
///
/// do nothing yet
- public List GeneratePickerResults(LLUUID queryID, string query)
+ public List GeneratePickerResults(UUID queryID, string query)
{
//Do nothing yet
List returnlist = new List();
@@ -217,14 +217,14 @@ namespace OpenSim.Data.SQLite
/// The attempted regionHandle of the challenger
/// The secret
/// Whether the secret and regionhandle match the database entry for UUID
- override public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey)
+ override public bool AuthenticateSim(UUID uuid, ulong handle, string authkey)
{
bool throwHissyFit = false; // Should be true by 1.0
if (throwHissyFit)
throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");
- RegionProfileData data = GetProfileByLLUUID(uuid);
+ RegionProfileData data = GetProfileByUUID(uuid);
return (handle == data.regionHandle && authkey == data.regionSecret);
}
@@ -238,7 +238,7 @@ namespace OpenSim.Data.SQLite
///
///
///
- public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge)
+ public bool AuthenticateSim(UUID uuid, ulong handle, string authhash, string challenge)
{
// SHA512Managed HashProvider = new SHA512Managed();
// Encoding TextProvider = new UTF8Encoding();
--
cgit v1.1