aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-04-08 17:50:57 +0000
committerJustin Clarke Casey2009-04-08 17:50:57 +0000
commitf3c7298fc5bdb35e8a293c9aee4134c8e8fe2856 (patch)
treecdcef4e023e1adf8bb4a83e5ebe81448dbf33c6b /OpenSim/Data/SQLite
parent* Fix the remainder of the packets that require sessionId checks. (diff)
downloadopensim-SC_OLD-f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856.zip
opensim-SC_OLD-f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856.tar.gz
opensim-SC_OLD-f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856.tar.bz2
opensim-SC_OLD-f3c7298fc5bdb35e8a293c9aee4134c8e8fe2856.tar.xz
* 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.
Diffstat (limited to 'OpenSim/Data/SQLite')
-rw-r--r--OpenSim/Data/SQLite/SQLiteInventoryStore.cs8
1 files changed, 4 insertions, 4 deletions
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
143 item.InvType = Convert.ToInt32(row["invType"]); 143 item.InvType = Convert.ToInt32(row["invType"]);
144 item.Folder = new UUID((string) row["parentFolderID"]); 144 item.Folder = new UUID((string) row["parentFolderID"]);
145 item.Owner = new UUID((string) row["avatarID"]); 145 item.Owner = new UUID((string) row["avatarID"]);
146 item.Creator = new UUID((string) row["creatorsID"]); 146 item.CreatorId = (string)row["creatorsID"];
147 item.Name = (string) row["inventoryName"]; 147 item.Name = (string) row["inventoryName"];
148 item.Description = (string) row["inventoryDescription"]; 148 item.Description = (string) row["inventoryDescription"];
149 149
@@ -176,7 +176,7 @@ namespace OpenSim.Data.SQLite
176 } 176 }
177 177
178 /// <summary> 178 /// <summary>
179 /// 179 /// Fill a database row with item data
180 /// </summary> 180 /// </summary>
181 /// <param name="row"></param> 181 /// <param name="row"></param>
182 /// <param name="item"></param> 182 /// <param name="item"></param>
@@ -188,7 +188,7 @@ namespace OpenSim.Data.SQLite
188 row["invType"] = item.InvType; 188 row["invType"] = item.InvType;
189 row["parentFolderID"] = Util.ToRawUuidString(item.Folder); 189 row["parentFolderID"] = Util.ToRawUuidString(item.Folder);
190 row["avatarID"] = Util.ToRawUuidString(item.Owner); 190 row["avatarID"] = Util.ToRawUuidString(item.Owner);
191 row["creatorsID"] = Util.ToRawUuidString(item.Creator); 191 row["creatorsID"] = Util.ToRawUuidString(item.CreatorIdAsUuid);
192 row["inventoryName"] = item.Name; 192 row["inventoryName"] = item.Name;
193 row["inventoryDescription"] = item.Description; 193 row["inventoryDescription"] = item.Description;
194 194
@@ -281,7 +281,7 @@ namespace OpenSim.Data.SQLite
281 DataRow inventoryRow = inventoryItemTable.Rows.Find(Util.ToRawUuidString(item.ID)); 281 DataRow inventoryRow = inventoryItemTable.Rows.Find(Util.ToRawUuidString(item.ID));
282 if (inventoryRow == null) 282 if (inventoryRow == null)
283 { 283 {
284 if (! add) 284 if (!add)
285 m_log.ErrorFormat("[INVENTORY DB]: Interface Misuse: Attempting to Update non-existant inventory item: {0}", item.ID); 285 m_log.ErrorFormat("[INVENTORY DB]: Interface Misuse: Attempting to Update non-existant inventory item: {0}", item.ID);
286 286
287 inventoryRow = inventoryItemTable.NewRow(); 287 inventoryRow = inventoryItemTable.NewRow();