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/SQLiteAssetData.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'OpenSim/Data/SQLite/SQLiteAssetData.cs') diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs index 220cebf..8b14f09 100644 --- a/OpenSim/Data/SQLite/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs @@ -28,7 +28,7 @@ using System; using System.Data; using System.Reflection; -using libsecondlife; +using OpenMetaverse; using log4net; using Mono.Data.SqliteClient; using OpenSim.Framework; @@ -87,7 +87,7 @@ namespace OpenSim.Data.SQLite /// /// UUID of ... ? /// Asset base - override public AssetBase FetchAsset(LLUUID uuid) + override public AssetBase FetchAsset(UUID uuid) { lock (this) { @@ -190,7 +190,7 @@ namespace OpenSim.Data.SQLite /// /// The asset UUID /// True if exist, or false. - override public bool ExistsAsset(LLUUID uuid) + override public bool ExistsAsset(UUID uuid) { lock (this) { using (SqliteCommand cmd = new SqliteCommand(SelectAssetSQL, m_conn)) @@ -217,7 +217,7 @@ namespace OpenSim.Data.SQLite /// Delete an asset from database /// /// - public void DeleteAsset(LLUUID uuid) + public void DeleteAsset(UUID uuid) { using (SqliteCommand cmd = new SqliteCommand(DeleteAssetSQL, m_conn)) { @@ -239,7 +239,7 @@ namespace OpenSim.Data.SQLite // back out. Not enough time to figure it out yet. AssetBase asset = new AssetBase(); - asset.FullID = new LLUUID((String) row["UUID"]); + asset.FullID = new UUID((String) row["UUID"]); asset.Name = (String) row["Name"]; asset.Description = (String) row["Description"]; asset.Type = Convert.ToSByte(row["Type"]); -- cgit v1.1