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/MySQL | |
parent | Updated SQLiteLegacy/SQLiteSimulationData with the same. Is this crap still u... (diff) | |
download | opensim-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 '')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/Resources/InventoryStore.migrations | 8 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/Resources/RegionStore.migrations | 1 |
3 files changed, 11 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index f630dc1..02997b3 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
@@ -1243,7 +1243,7 @@ namespace OpenSim.Data.MySQL | |||
1243 | taskItem.Name = (String)row["name"]; | 1243 | taskItem.Name = (String)row["name"]; |
1244 | taskItem.Description = (String)row["description"]; | 1244 | taskItem.Description = (String)row["description"]; |
1245 | taskItem.CreationDate = Convert.ToUInt32(row["creationDate"]); | 1245 | taskItem.CreationDate = Convert.ToUInt32(row["creationDate"]); |
1246 | taskItem.CreatorID = DBGuid.FromDB(row["creatorID"]); | 1246 | taskItem.CreatorIdentification = (String)row["creatorID"]; |
1247 | taskItem.OwnerID = DBGuid.FromDB(row["ownerID"]); | 1247 | taskItem.OwnerID = DBGuid.FromDB(row["ownerID"]); |
1248 | taskItem.LastOwnerID = DBGuid.FromDB(row["lastOwnerID"]); | 1248 | taskItem.LastOwnerID = DBGuid.FromDB(row["lastOwnerID"]); |
1249 | taskItem.GroupID = DBGuid.FromDB(row["groupID"]); | 1249 | taskItem.GroupID = DBGuid.FromDB(row["groupID"]); |
@@ -1583,7 +1583,7 @@ namespace OpenSim.Data.MySQL | |||
1583 | cmd.Parameters.AddWithValue("name", taskItem.Name); | 1583 | cmd.Parameters.AddWithValue("name", taskItem.Name); |
1584 | cmd.Parameters.AddWithValue("description", taskItem.Description); | 1584 | cmd.Parameters.AddWithValue("description", taskItem.Description); |
1585 | cmd.Parameters.AddWithValue("creationDate", taskItem.CreationDate); | 1585 | cmd.Parameters.AddWithValue("creationDate", taskItem.CreationDate); |
1586 | cmd.Parameters.AddWithValue("creatorID", taskItem.CreatorID); | 1586 | cmd.Parameters.AddWithValue("creatorID", taskItem.CreatorIdentification); |
1587 | cmd.Parameters.AddWithValue("ownerID", taskItem.OwnerID); | 1587 | cmd.Parameters.AddWithValue("ownerID", taskItem.OwnerID); |
1588 | cmd.Parameters.AddWithValue("lastOwnerID", taskItem.LastOwnerID); | 1588 | cmd.Parameters.AddWithValue("lastOwnerID", taskItem.LastOwnerID); |
1589 | cmd.Parameters.AddWithValue("groupID", taskItem.GroupID); | 1589 | cmd.Parameters.AddWithValue("groupID", taskItem.GroupID); |
diff --git a/OpenSim/Data/MySQL/Resources/InventoryStore.migrations b/OpenSim/Data/MySQL/Resources/InventoryStore.migrations index 3e9bad5..993a5a0 100644 --- a/OpenSim/Data/MySQL/Resources/InventoryStore.migrations +++ b/OpenSim/Data/MySQL/Resources/InventoryStore.migrations | |||
@@ -99,3 +99,11 @@ BEGIN; | |||
99 | alter table inventoryitems modify column creatorID varchar(128) not NULL default '00000000-0000-0000-0000-000000000000'; | 99 | alter table inventoryitems modify column creatorID varchar(128) not NULL default '00000000-0000-0000-0000-000000000000'; |
100 | 100 | ||
101 | COMMIT; | 101 | COMMIT; |
102 | |||
103 | :VERSION 6 # ------------ | ||
104 | |||
105 | BEGIN; | ||
106 | |||
107 | alter table inventoryitems modify column creatorID varchar(255) not NULL default '00000000-0000-0000-0000-000000000000'; | ||
108 | |||
109 | COMMIT; | ||
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations index 364c4d3..ba8d538 100644 --- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations +++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations | |||
@@ -823,5 +823,6 @@ COMMIT; | |||
823 | BEGIN; | 823 | BEGIN; |
824 | 824 | ||
825 | ALTER TABLE `prims` MODIFY COLUMN `CreatorID` VARCHAR(255) NOT NULL DEFAULT ''; | 825 | ALTER TABLE `prims` MODIFY COLUMN `CreatorID` VARCHAR(255) NOT NULL DEFAULT ''; |
826 | ALTER TABLE `primitems` MODIFY COLUMN `CreatorID` VARCHAR(255) NOT NULL DEFAULT ''; | ||
826 | 827 | ||
827 | COMMIT; | 828 | COMMIT; |