From f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Wed, 8 Apr 2009 17:50:57 +0000
Subject: * Make it possible to store creator strings in user inventory items
 as well as UUIDs * All existing functionality should be unaffected. *
 Database schemas have not been changed.

---
 OpenSim/Data/SQLite/SQLiteInventoryStore.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Data/SQLite/SQLiteInventoryStore.cs')

diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index bd18c11..aedcd82 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -143,7 +143,7 @@ namespace OpenSim.Data.SQLite
             item.InvType = Convert.ToInt32(row["invType"]);
             item.Folder = new UUID((string) row["parentFolderID"]);
             item.Owner = new UUID((string) row["avatarID"]);
-            item.Creator = new UUID((string) row["creatorsID"]);
+            item.CreatorId = (string)row["creatorsID"];
             item.Name = (string) row["inventoryName"];
             item.Description = (string) row["inventoryDescription"];
 
@@ -176,7 +176,7 @@ namespace OpenSim.Data.SQLite
         }
 
         /// <summary>
-        ///
+        /// Fill a database row with item data
         /// </summary>
         /// <param name="row"></param>
         /// <param name="item"></param>
@@ -188,7 +188,7 @@ namespace OpenSim.Data.SQLite
             row["invType"] = item.InvType;
             row["parentFolderID"] = Util.ToRawUuidString(item.Folder);
             row["avatarID"] = Util.ToRawUuidString(item.Owner);
-            row["creatorsID"] = Util.ToRawUuidString(item.Creator);
+            row["creatorsID"] = Util.ToRawUuidString(item.CreatorIdAsUuid);
             row["inventoryName"] = item.Name;
             row["inventoryDescription"] = item.Description;
 
@@ -281,7 +281,7 @@ namespace OpenSim.Data.SQLite
                 DataRow inventoryRow = inventoryItemTable.Rows.Find(Util.ToRawUuidString(item.ID));
                 if (inventoryRow == null)
                 {
-                    if (! add)
+                    if (!add)
                         m_log.ErrorFormat("[INVENTORY DB]: Interface Misuse: Attempting to Update non-existant inventory item: {0}", item.ID);
 
                     inventoryRow = inventoryItemTable.NewRow();
-- 
cgit v1.1