aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLiteLegacy/SQLiteInventoryStore.cs
diff options
context:
space:
mode:
authorMelanie2010-11-22 01:09:26 +0000
committerMelanie2010-11-22 01:09:26 +0000
commit22ff06ba170e3906c80c8ccdb238cff3480301df (patch)
tree1d2a671385ed394d4479773e7e0d415dea72ab37 /OpenSim/Data/SQLiteLegacy/SQLiteInventoryStore.cs
parentFox the buglets in Freeswitch. Grid mode works now and there is no reason why... (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-22ff06ba170e3906c80c8ccdb238cff3480301df.zip
opensim-SC-22ff06ba170e3906c80c8ccdb238cff3480301df.tar.gz
opensim-SC-22ff06ba170e3906c80c8ccdb238cff3480301df.tar.bz2
opensim-SC-22ff06ba170e3906c80c8ccdb238cff3480301df.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Data/SQLiteLegacy/SQLiteInventoryStore.cs')
-rw-r--r--OpenSim/Data/SQLiteLegacy/SQLiteInventoryStore.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteInventoryStore.cs b/OpenSim/Data/SQLiteLegacy/SQLiteInventoryStore.cs
index 726703b..8ca48f9 100644
--- a/OpenSim/Data/SQLiteLegacy/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLiteLegacy/SQLiteInventoryStore.cs
@@ -150,7 +150,7 @@ namespace OpenSim.Data.SQLiteLegacy
150 item.InvType = Convert.ToInt32(row["invType"]); 150 item.InvType = Convert.ToInt32(row["invType"]);
151 item.Folder = new UUID((string) row["parentFolderID"]); 151 item.Folder = new UUID((string) row["parentFolderID"]);
152 item.Owner = new UUID((string) row["avatarID"]); 152 item.Owner = new UUID((string) row["avatarID"]);
153 item.CreatorId = (string)row["creatorsID"]; 153 item.CreatorIdentification = (string)row["creatorsID"];
154 item.Name = (string) row["inventoryName"]; 154 item.Name = (string) row["inventoryName"];
155 item.Description = (string) row["inventoryDescription"]; 155 item.Description = (string) row["inventoryDescription"];
156 156
@@ -195,7 +195,7 @@ namespace OpenSim.Data.SQLiteLegacy
195 row["invType"] = item.InvType; 195 row["invType"] = item.InvType;
196 row["parentFolderID"] = item.Folder.ToString(); 196 row["parentFolderID"] = item.Folder.ToString();
197 row["avatarID"] = item.Owner.ToString(); 197 row["avatarID"] = item.Owner.ToString();
198 row["creatorsID"] = item.CreatorId.ToString(); 198 row["creatorsID"] = item.CreatorIdentification.ToString();
199 row["inventoryName"] = item.Name; 199 row["inventoryName"] = item.Name;
200 row["inventoryDescription"] = item.Description; 200 row["inventoryDescription"] = item.Description;
201 201