diff options
author | Diva Canto | 2010-11-21 17:19:24 -0800 |
---|---|---|
committer | Diva Canto | 2010-11-21 17:19:24 -0800 |
commit | c617d658dda92ad97de678d477a98c3df0659303 (patch) | |
tree | 9a86356af2fcf4ae4eab18b53dc7330bf3e26a86 /OpenSim/Data/SQLite | |
parent | Updated SQLiteLegacy/SQLiteSimulationData with the same. Is this crap still u... (diff) | |
download | opensim-SC_OLD-c617d658dda92ad97de678d477a98c3df0659303.zip opensim-SC_OLD-c617d658dda92ad97de678d477a98c3df0659303.tar.gz opensim-SC_OLD-c617d658dda92ad97de678d477a98c3df0659303.tar.bz2 opensim-SC_OLD-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/SQLite')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteInventoryStore.cs | 4 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs index d606f11..7dc07ec 100644 --- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs +++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs | |||
@@ -156,7 +156,7 @@ namespace OpenSim.Data.SQLite | |||
156 | item.InvType = Convert.ToInt32(row["invType"]); | 156 | item.InvType = Convert.ToInt32(row["invType"]); |
157 | item.Folder = new UUID((string) row["parentFolderID"]); | 157 | item.Folder = new UUID((string) row["parentFolderID"]); |
158 | item.Owner = new UUID((string) row["avatarID"]); | 158 | item.Owner = new UUID((string) row["avatarID"]); |
159 | item.CreatorId = (string)row["creatorsID"]; | 159 | item.CreatorIdentification = (string)row["creatorsID"]; |
160 | item.Name = (string) row["inventoryName"]; | 160 | item.Name = (string) row["inventoryName"]; |
161 | item.Description = (string) row["inventoryDescription"]; | 161 | item.Description = (string) row["inventoryDescription"]; |
162 | 162 | ||
@@ -201,7 +201,7 @@ namespace OpenSim.Data.SQLite | |||
201 | row["invType"] = item.InvType; | 201 | row["invType"] = item.InvType; |
202 | row["parentFolderID"] = item.Folder.ToString(); | 202 | row["parentFolderID"] = item.Folder.ToString(); |
203 | row["avatarID"] = item.Owner.ToString(); | 203 | row["avatarID"] = item.Owner.ToString(); |
204 | row["creatorsID"] = item.CreatorId.ToString(); | 204 | row["creatorsID"] = item.CreatorIdentification.ToString(); |
205 | row["inventoryName"] = item.Name; | 205 | row["inventoryName"] = item.Name; |
206 | row["inventoryDescription"] = item.Description; | 206 | row["inventoryDescription"] = item.Description; |
207 | 207 | ||
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index 85a3a37..0bfd73a 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs | |||
@@ -1385,7 +1385,7 @@ namespace OpenSim.Data.SQLite | |||
1385 | taskItem.Name = (String)row["name"]; | 1385 | taskItem.Name = (String)row["name"]; |
1386 | taskItem.Description = (String)row["description"]; | 1386 | taskItem.Description = (String)row["description"]; |
1387 | taskItem.CreationDate = Convert.ToUInt32(row["creationDate"]); | 1387 | taskItem.CreationDate = Convert.ToUInt32(row["creationDate"]); |
1388 | taskItem.CreatorID = new UUID((String)row["creatorID"]); | 1388 | taskItem.CreatorIdentification = (String)row["creatorID"]; |
1389 | taskItem.OwnerID = new UUID((String)row["ownerID"]); | 1389 | taskItem.OwnerID = new UUID((String)row["ownerID"]); |
1390 | taskItem.LastOwnerID = new UUID((String)row["lastOwnerID"]); | 1390 | taskItem.LastOwnerID = new UUID((String)row["lastOwnerID"]); |
1391 | taskItem.GroupID = new UUID((String)row["groupID"]); | 1391 | taskItem.GroupID = new UUID((String)row["groupID"]); |
@@ -1716,7 +1716,7 @@ namespace OpenSim.Data.SQLite | |||
1716 | row["name"] = taskItem.Name; | 1716 | row["name"] = taskItem.Name; |
1717 | row["description"] = taskItem.Description; | 1717 | row["description"] = taskItem.Description; |
1718 | row["creationDate"] = taskItem.CreationDate; | 1718 | row["creationDate"] = taskItem.CreationDate; |
1719 | row["creatorID"] = taskItem.CreatorID.ToString(); | 1719 | row["creatorID"] = taskItem.CreatorIdentification.ToString(); |
1720 | row["ownerID"] = taskItem.OwnerID.ToString(); | 1720 | row["ownerID"] = taskItem.OwnerID.ToString(); |
1721 | row["lastOwnerID"] = taskItem.LastOwnerID.ToString(); | 1721 | row["lastOwnerID"] = taskItem.LastOwnerID.ToString(); |
1722 | row["groupID"] = taskItem.GroupID.ToString(); | 1722 | row["groupID"] = taskItem.GroupID.ToString(); |