Merge branch 'master' of ssh://MyConnection/var/git/opensim

3 files changed, 23 insertions, 38 deletions

diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 72af7a0..3831467 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -90,7 +90,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="uuid">UUID of ... ?</param>
         /// <returns>Asset base</returns>
-        override protected AssetBase FetchStoredAsset(UUID uuid)
+        override public AssetBase GetAsset(UUID uuid)
         {
             lock (this)
             {
@@ -119,18 +119,16 @@ namespace OpenSim.Data.SQLite
         /// Create an asset
         /// </summary>
         /// <param name="asset">Asset Base</param>
-        override public void CreateAsset(AssetBase asset)
+        override public void StoreAsset(AssetBase asset)
         {
             //m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID.ToString());
             if (ExistsAsset(asset.FullID))
             {
-                //m_log.Info("[ASSET DB]: Asset exists already, ignoring.");
-            }
-            else
-            {
+                LogAssetLoad(asset);
+
                 lock (this)
                 {
-                    using (SqliteCommand cmd = new SqliteCommand(InsertAssetSQL, m_conn))
+                    using (SqliteCommand cmd = new SqliteCommand(UpdateAssetSQL, m_conn))
                     {
                         cmd.Parameters.Add(new SqliteParameter(":UUID", asset.FullID.ToString()));
                         cmd.Parameters.Add(new SqliteParameter(":Name", asset.Name));
@@ -144,29 +142,22 @@ namespace OpenSim.Data.SQLite
                     }
                 }
             }
-        }
-
-        /// <summary>
-        /// Update an asset
-        /// </summary>
-        /// <param name="asset"></param>
-        override public void UpdateAsset(AssetBase asset)
-        {
-            LogAssetLoad(asset);
-
-            lock (this)
+            else
             {
-                using (SqliteCommand cmd = new SqliteCommand(UpdateAssetSQL, m_conn))
+                lock (this)
                 {
-                    cmd.Parameters.Add(new SqliteParameter(":UUID", asset.FullID.ToString()));
-                    cmd.Parameters.Add(new SqliteParameter(":Name", asset.Name));
-                    cmd.Parameters.Add(new SqliteParameter(":Description", asset.Description));
-                    cmd.Parameters.Add(new SqliteParameter(":Type", asset.Type));
-                    cmd.Parameters.Add(new SqliteParameter(":Local", asset.Local));
-                    cmd.Parameters.Add(new SqliteParameter(":Temporary", asset.Temporary));
-                    cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
-
-                    cmd.ExecuteNonQuery();
+                    using (SqliteCommand cmd = new SqliteCommand(InsertAssetSQL, m_conn))
+                    {
+                        cmd.Parameters.Add(new SqliteParameter(":UUID", asset.FullID.ToString()));
+                        cmd.Parameters.Add(new SqliteParameter(":Name", asset.Name));
+                        cmd.Parameters.Add(new SqliteParameter(":Description", asset.Description));
+                        cmd.Parameters.Add(new SqliteParameter(":Type", asset.Type));
+                        cmd.Parameters.Add(new SqliteParameter(":Local", asset.Local));
+                        cmd.Parameters.Add(new SqliteParameter(":Temporary", asset.Temporary));
+                        cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
+
+                        cmd.ExecuteNonQuery();
+                    }
                 }
             }
         }
diff --git a/OpenSim/Data/SQLite/SQLiteGridData.cs b/OpenSim/Data/SQLite/SQLiteGridData.cs
index 4107594..18abb88 100644
--- a/OpenSim/Data/SQLite/SQLiteGridData.cs
+++ b/OpenSim/Data/SQLite/SQLiteGridData.cs
@@ -203,7 +203,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="profile">The profile to add</param>
         /// <returns>A dataresponse enum indicating success</returns>
-        override public DataResponse AddProfile(RegionProfileData profile)
+        override public DataResponse StoreProfile(RegionProfileData profile)
         {
             if (database.insertRow(profile))
             {
@@ -215,17 +215,11 @@ namespace OpenSim.Data.SQLite
             }
         }
 
-        override public DataResponse UpdateProfile(RegionProfileData profile)
-        {
-            return AddProfile(profile);
-        }
-
-                /// <summary>
+        /// <summary>
         /// Deletes a sim profile from the database
         /// </summary>
         /// <param name="uuid">the sim UUID</param>
         /// <returns>Successful?</returns>
-        //public DataResponse DeleteProfile(RegionProfileData profile)
         override public DataResponse DeleteProfile(string uuid)
         {
             Dictionary<string, string> param = new Dictionary<string, string>();
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index e5f7a50..64591fd 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -628,12 +628,12 @@ namespace OpenSim.Data.SQLite
 
         public InventoryItemBase queryInventoryItem(UUID itemID)
         {
-            return null;
+            return getInventoryItem(itemID);
         }
 
         public InventoryFolderBase queryInventoryFolder(UUID folderID)
         {
-            return null;
+            return getInventoryFolder(folderID);
         }
 
         /// <summary>