diff options
author | Melanie | 2010-11-22 00:46:37 +0000 |
---|---|---|
committer | Melanie | 2010-11-22 00:46:37 +0000 |
commit | 8466ada8e05c69d9fcd6f8191803d5c40659b641 (patch) | |
tree | 1ad6665b23863060d4ba1c1a91cae4f33f017a38 /OpenSim/Data/MySQL | |
parent | Fox the buglets in Freeswitch. Grid mode works now and there is no reason why... (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-8466ada8e05c69d9fcd6f8191803d5c40659b641.zip opensim-SC-8466ada8e05c69d9fcd6f8191803d5c40659b641.tar.gz opensim-SC-8466ada8e05c69d9fcd6f8191803d5c40659b641.tar.bz2 opensim-SC-8466ada8e05c69d9fcd6f8191803d5c40659b641.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 8 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/Resources/InventoryStore.migrations | 8 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/Resources/RegionStore.migrations | 9 |
3 files changed, 21 insertions, 4 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index ae78814..02997b3 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
@@ -1090,7 +1090,7 @@ namespace OpenSim.Data.MySQL | |||
1090 | 1090 | ||
1091 | // depending on the MySQL connector version, CHAR(36) may be already converted to Guid! | 1091 | // depending on the MySQL connector version, CHAR(36) may be already converted to Guid! |
1092 | prim.UUID = DBGuid.FromDB(row["UUID"]); | 1092 | prim.UUID = DBGuid.FromDB(row["UUID"]); |
1093 | prim.CreatorID = DBGuid.FromDB(row["CreatorID"]); | 1093 | prim.CreatorIdentification = (string)row["CreatorID"]; |
1094 | prim.OwnerID = DBGuid.FromDB(row["OwnerID"]); | 1094 | prim.OwnerID = DBGuid.FromDB(row["OwnerID"]); |
1095 | prim.GroupID = DBGuid.FromDB(row["GroupID"]); | 1095 | prim.GroupID = DBGuid.FromDB(row["GroupID"]); |
1096 | prim.LastOwnerID = DBGuid.FromDB(row["LastOwnerID"]); | 1096 | prim.LastOwnerID = DBGuid.FromDB(row["LastOwnerID"]); |
@@ -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"]); |
@@ -1453,7 +1453,7 @@ namespace OpenSim.Data.MySQL | |||
1453 | cmd.Parameters.AddWithValue("TouchName", prim.TouchName); | 1453 | cmd.Parameters.AddWithValue("TouchName", prim.TouchName); |
1454 | // permissions | 1454 | // permissions |
1455 | cmd.Parameters.AddWithValue("ObjectFlags", (uint)prim.Flags); | 1455 | cmd.Parameters.AddWithValue("ObjectFlags", (uint)prim.Flags); |
1456 | cmd.Parameters.AddWithValue("CreatorID", prim.CreatorID.ToString()); | 1456 | cmd.Parameters.AddWithValue("CreatorID", prim.CreatorIdentification.ToString()); |
1457 | cmd.Parameters.AddWithValue("OwnerID", prim.OwnerID.ToString()); | 1457 | cmd.Parameters.AddWithValue("OwnerID", prim.OwnerID.ToString()); |
1458 | cmd.Parameters.AddWithValue("GroupID", prim.GroupID.ToString()); | 1458 | cmd.Parameters.AddWithValue("GroupID", prim.GroupID.ToString()); |
1459 | cmd.Parameters.AddWithValue("LastOwnerID", prim.LastOwnerID.ToString()); | 1459 | cmd.Parameters.AddWithValue("LastOwnerID", prim.LastOwnerID.ToString()); |
@@ -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 1405207..ba8d538 100644 --- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations +++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations | |||
@@ -817,3 +817,12 @@ ALTER TABLE `land` ADD COLUMN `MediaLoop` BOOLEAN NOT NULL DEFAULT FALSE; | |||
817 | ALTER TABLE `land` ADD COLUMN `ObscureMusic` BOOLEAN NOT NULL DEFAULT FALSE; | 817 | ALTER TABLE `land` ADD COLUMN `ObscureMusic` BOOLEAN NOT NULL DEFAULT FALSE; |
818 | ALTER TABLE `land` ADD COLUMN `ObscureMedia` BOOLEAN NOT NULL DEFAULT FALSE; | 818 | ALTER TABLE `land` ADD COLUMN `ObscureMedia` BOOLEAN NOT NULL DEFAULT FALSE; |
819 | COMMIT; | 819 | COMMIT; |
820 | |||
821 | :VERSION 37 #--------------------- | ||
822 | |||
823 | BEGIN; | ||
824 | |||
825 | ALTER TABLE `prims` MODIFY COLUMN `CreatorID` VARCHAR(255) NOT NULL DEFAULT ''; | ||
826 | ALTER TABLE `primitems` MODIFY COLUMN `CreatorID` VARCHAR(255) NOT NULL DEFAULT ''; | ||
827 | |||
828 | COMMIT; | ||