From f1287cc7af7da26910c5cba456a8c35b6454d815 Mon Sep 17 00:00:00 2001
From: Kunnis
Date: Sun, 16 Aug 2009 18:54:20 -0500
Subject: * Switching IAssetData to follow the new naming schema, removing the
separate insert and update methods.
---
OpenSim/Data/MySQL/MySQLAssetData.cs | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
(limited to 'OpenSim/Data/MySQL/MySQLAssetData.cs')
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 0865083..1b4377a 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -135,7 +135,7 @@ namespace OpenSim.Data.MySQL
/// Asset UUID to fetch
/// Return the asset
/// On failure : throw an exception and attempt to reconnect to database
- override protected AssetBase FetchStoredAsset(UUID assetID)
+ override public AssetBase GetAsset(UUID assetID)
{
AssetBase asset = null;
lock (_dbConnection)
@@ -192,7 +192,7 @@ namespace OpenSim.Data.MySQL
///
/// Asset UUID to create
/// On failure : Throw an exception and attempt to reconnect to database
- override public void CreateAsset(AssetBase asset)
+ override public void StoreAsset(AssetBase asset)
{
lock (_dbConnection)
{
@@ -285,15 +285,6 @@ namespace OpenSim.Data.MySQL
}
///
- /// Update a asset in database, see
- ///
- /// Asset UUID to update
- override public void UpdateAsset(AssetBase asset)
- {
- CreateAsset(asset);
- }
-
- ///
/// check if the asset UUID exist in database
///
/// The asset UUID
--
cgit v1.1
From 604ef5ba799c4ac6af4a965ede726faf42916ad6 Mon Sep 17 00:00:00 2001
From: Arthur Valadares
Date: Fri, 21 Aug 2009 17:48:45 -0300
Subject: Fix issue where conversion of temporary boolean variable fails on
MySQL
---
OpenSim/Data/MySQL/MySQLAssetData.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Data/MySQL/MySQLAssetData.cs')
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 1b4377a..66c34fe 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -168,7 +168,7 @@ namespace OpenSim.Data.MySQL
}
asset.Name = (string) dbReader["name"];
asset.Type = (sbyte) dbReader["assetType"];
- asset.Temporary = (bool)dbReader["temporary"];
+ asset.Temporary = Convert.ToBoolean(dbReader["temporary"]);
}
dbReader.Close();
cmd.Dispose();
@@ -359,7 +359,7 @@ namespace OpenSim.Data.MySQL
metadata.Name = (string) dbReader["name"];
metadata.Description = (string) dbReader["description"];
metadata.Type = (sbyte) dbReader["assetType"];
- metadata.Temporary = (bool) dbReader["temporary"]; // Not sure if this is correct.
+ metadata.Temporary = Convert.ToBoolean(dbReader["temporary"]); // Not sure if this is correct.
metadata.FullID = new UUID((string) dbReader["id"]);
// Current SHA1s are not stored/computed.
--
cgit v1.1