aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLiteLegacy
diff options
context:
space:
mode:
authorDiva Canto2010-11-21 17:19:24 -0800
committerDiva Canto2010-11-21 17:19:24 -0800
commitc617d658dda92ad97de678d477a98c3df0659303 (patch)
tree9a86356af2fcf4ae4eab18b53dc7330bf3e26a86 /OpenSim/Data/SQLiteLegacy
parentUpdated SQLiteLegacy/SQLiteSimulationData with the same. Is this crap still u... (diff)
downloadopensim-SC-c617d658dda92ad97de678d477a98c3df0659303.zip
opensim-SC-c617d658dda92ad97de678d477a98c3df0659303.tar.gz
opensim-SC-c617d658dda92ad97de678d477a98c3df0659303.tar.bz2
opensim-SC-c617d658dda92ad97de678d477a98c3df0659303.tar.xz
Added creator info across the board -- TaskInventoryItems and InventoryItems themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being.
New migration in inventory table in order to make CreatorID varchar(255).
Diffstat (limited to 'OpenSim/Data/SQLiteLegacy')
-rw-r--r--OpenSim/Data/SQLiteLegacy/SQLiteInventoryStore.cs4
-rw-r--r--OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs4
2 files changed, 4 insertions, 4 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
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs b/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs
index bcc1006..1ad1e66 100644
--- a/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs
@@ -1334,7 +1334,7 @@ namespace OpenSim.Data.SQLiteLegacy
1334 taskItem.Name = (String)row["name"]; 1334 taskItem.Name = (String)row["name"];
1335 taskItem.Description = (String)row["description"]; 1335 taskItem.Description = (String)row["description"];
1336 taskItem.CreationDate = Convert.ToUInt32(row["creationDate"]); 1336 taskItem.CreationDate = Convert.ToUInt32(row["creationDate"]);
1337 taskItem.CreatorID = new UUID((String)row["creatorID"]); 1337 taskItem.CreatorIdentification = (String)row["creatorID"];
1338 taskItem.OwnerID = new UUID((String)row["ownerID"]); 1338 taskItem.OwnerID = new UUID((String)row["ownerID"]);
1339 taskItem.LastOwnerID = new UUID((String)row["lastOwnerID"]); 1339 taskItem.LastOwnerID = new UUID((String)row["lastOwnerID"]);
1340 taskItem.GroupID = new UUID((String)row["groupID"]); 1340 taskItem.GroupID = new UUID((String)row["groupID"]);
@@ -1664,7 +1664,7 @@ namespace OpenSim.Data.SQLiteLegacy
1664 row["name"] = taskItem.Name; 1664 row["name"] = taskItem.Name;
1665 row["description"] = taskItem.Description; 1665 row["description"] = taskItem.Description;
1666 row["creationDate"] = taskItem.CreationDate; 1666 row["creationDate"] = taskItem.CreationDate;
1667 row["creatorID"] = taskItem.CreatorID.ToString(); 1667 row["creatorID"] = taskItem.CreatorIdentification.ToString();
1668 row["ownerID"] = taskItem.OwnerID.ToString(); 1668 row["ownerID"] = taskItem.OwnerID.ToString();
1669 row["lastOwnerID"] = taskItem.LastOwnerID.ToString(); 1669 row["lastOwnerID"] = taskItem.LastOwnerID.ToString();
1670 row["groupID"] = taskItem.GroupID.ToString(); 1670 row["groupID"] = taskItem.GroupID.ToString();