diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 9 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/Resources/RegionStore.migrations | 8 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/Resources/RegionStore.migrations | 8 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 3 |
4 files changed, 26 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index ab24b76..2aaa2ff 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
@@ -167,7 +167,7 @@ namespace OpenSim.Data.MySQL | |||
167 | "SitTargetOrientY, SitTargetOrientZ, " + | 167 | "SitTargetOrientY, SitTargetOrientZ, " + |
168 | "RegionUUID, CreatorID, " + | 168 | "RegionUUID, CreatorID, " + |
169 | "OwnerID, GroupID, " + | 169 | "OwnerID, GroupID, " + |
170 | "LastOwnerID, SceneGroupID, " + | 170 | "LastOwnerID, RezzerID, SceneGroupID, " + |
171 | "PayPrice, PayButton1, " + | 171 | "PayPrice, PayButton1, " + |
172 | "PayButton2, PayButton3, " + | 172 | "PayButton2, PayButton3, " + |
173 | "PayButton4, LoopedSound, " + | 173 | "PayButton4, LoopedSound, " + |
@@ -207,7 +207,7 @@ namespace OpenSim.Data.MySQL | |||
207 | "?SitTargetOrientW, ?SitTargetOrientX, " + | 207 | "?SitTargetOrientW, ?SitTargetOrientX, " + |
208 | "?SitTargetOrientY, ?SitTargetOrientZ, " + | 208 | "?SitTargetOrientY, ?SitTargetOrientZ, " + |
209 | "?RegionUUID, ?CreatorID, ?OwnerID, " + | 209 | "?RegionUUID, ?CreatorID, ?OwnerID, " + |
210 | "?GroupID, ?LastOwnerID, ?SceneGroupID, " + | 210 | "?GroupID, ?LastOwnerID, ?RezzerID, ?SceneGroupID, " + |
211 | "?PayPrice, ?PayButton1, ?PayButton2, " + | 211 | "?PayPrice, ?PayButton1, ?PayButton2, " + |
212 | "?PayButton3, ?PayButton4, ?LoopedSound, " + | 212 | "?PayButton3, ?PayButton4, ?LoopedSound, " + |
213 | "?LoopedSoundGain, ?TextureAnimation, " + | 213 | "?LoopedSoundGain, ?TextureAnimation, " + |
@@ -1279,6 +1279,10 @@ namespace OpenSim.Data.MySQL | |||
1279 | prim.OwnerID = DBGuid.FromDB(row["OwnerID"]); | 1279 | prim.OwnerID = DBGuid.FromDB(row["OwnerID"]); |
1280 | prim.GroupID = DBGuid.FromDB(row["GroupID"]); | 1280 | prim.GroupID = DBGuid.FromDB(row["GroupID"]); |
1281 | prim.LastOwnerID = DBGuid.FromDB(row["LastOwnerID"]); | 1281 | prim.LastOwnerID = DBGuid.FromDB(row["LastOwnerID"]); |
1282 | if (row["RezzerID"] != DBNull.Value) | ||
1283 | prim.RezzerID = DBGuid.FromDB(row["RezzerID"]); | ||
1284 | else | ||
1285 | prim.RezzerID = UUID.Zero; | ||
1282 | 1286 | ||
1283 | // explicit conversion of integers is required, which sort | 1287 | // explicit conversion of integers is required, which sort |
1284 | // of sucks. No idea if there is a shortcut here or not. | 1288 | // of sucks. No idea if there is a shortcut here or not. |
@@ -1682,6 +1686,7 @@ namespace OpenSim.Data.MySQL | |||
1682 | cmd.Parameters.AddWithValue("OwnerID", prim.OwnerID.ToString()); | 1686 | cmd.Parameters.AddWithValue("OwnerID", prim.OwnerID.ToString()); |
1683 | cmd.Parameters.AddWithValue("GroupID", prim.GroupID.ToString()); | 1687 | cmd.Parameters.AddWithValue("GroupID", prim.GroupID.ToString()); |
1684 | cmd.Parameters.AddWithValue("LastOwnerID", prim.LastOwnerID.ToString()); | 1688 | cmd.Parameters.AddWithValue("LastOwnerID", prim.LastOwnerID.ToString()); |
1689 | cmd.Parameters.AddWithValue("RezzerID", prim.RezzerID.ToString()); | ||
1685 | cmd.Parameters.AddWithValue("OwnerMask", prim.OwnerMask); | 1690 | cmd.Parameters.AddWithValue("OwnerMask", prim.OwnerMask); |
1686 | cmd.Parameters.AddWithValue("NextOwnerMask", prim.NextOwnerMask); | 1691 | cmd.Parameters.AddWithValue("NextOwnerMask", prim.NextOwnerMask); |
1687 | cmd.Parameters.AddWithValue("GroupMask", prim.GroupMask); | 1692 | cmd.Parameters.AddWithValue("GroupMask", prim.GroupMask); |
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations index edc04b9..2108c76 100644 --- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations +++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations | |||
@@ -453,3 +453,11 @@ MODIFY `cloud_scroll_x` float(9,7) NOT NULL DEFAULT '0.20', | |||
453 | MODIFY `cloud_scroll_y` float(9,7) NOT NULL DEFAULT '0.01'; | 453 | MODIFY `cloud_scroll_y` float(9,7) NOT NULL DEFAULT '0.01'; |
454 | 454 | ||
455 | COMMIT; | 455 | COMMIT; |
456 | |||
457 | :VERSION 56 #----- Add RezzerID field in table prims | ||
458 | |||
459 | BEGIN; | ||
460 | |||
461 | ALTER TABLE `prims` ADD COLUMN `RezzerID` char(36) DEFAULT NULL; | ||
462 | |||
463 | COMMIT; | ||
diff --git a/OpenSim/Data/SQLite/Resources/RegionStore.migrations b/OpenSim/Data/SQLite/Resources/RegionStore.migrations index 64624db..eef14d6 100644 --- a/OpenSim/Data/SQLite/Resources/RegionStore.migrations +++ b/OpenSim/Data/SQLite/Resources/RegionStore.migrations | |||
@@ -363,3 +363,11 @@ CREATE TABLE IF NOT EXISTS bakedterrain( | |||
363 | Heightfield blob); | 363 | Heightfield blob); |
364 | 364 | ||
365 | COMMIT; | 365 | COMMIT; |
366 | |||
367 | :VERSION 35 #----- Add RezzerID field in table prims | ||
368 | |||
369 | BEGIN; | ||
370 | |||
371 | ALTER TABLE `prims` ADD COLUMN `RezzerID` char(36) DEFAULT NULL; | ||
372 | |||
373 | COMMIT; | ||
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index c1c7b7e..5cfc202 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs | |||
@@ -1216,6 +1216,7 @@ namespace OpenSim.Data.SQLite | |||
1216 | createCol(prims, "OwnerID", typeof(String)); | 1216 | createCol(prims, "OwnerID", typeof(String)); |
1217 | createCol(prims, "GroupID", typeof(String)); | 1217 | createCol(prims, "GroupID", typeof(String)); |
1218 | createCol(prims, "LastOwnerID", typeof(String)); | 1218 | createCol(prims, "LastOwnerID", typeof(String)); |
1219 | createCol(prims, "RezzerID", typeof(String)); | ||
1219 | createCol(prims, "OwnerMask", typeof(Int32)); | 1220 | createCol(prims, "OwnerMask", typeof(Int32)); |
1220 | createCol(prims, "NextOwnerMask", typeof(Int32)); | 1221 | createCol(prims, "NextOwnerMask", typeof(Int32)); |
1221 | createCol(prims, "GroupMask", typeof(Int32)); | 1222 | createCol(prims, "GroupMask", typeof(Int32)); |
@@ -1679,6 +1680,7 @@ namespace OpenSim.Data.SQLite | |||
1679 | prim.OwnerID = new UUID((String)row["OwnerID"]); | 1680 | prim.OwnerID = new UUID((String)row["OwnerID"]); |
1680 | prim.GroupID = new UUID((String)row["GroupID"]); | 1681 | prim.GroupID = new UUID((String)row["GroupID"]); |
1681 | prim.LastOwnerID = new UUID((String)row["LastOwnerID"]); | 1682 | prim.LastOwnerID = new UUID((String)row["LastOwnerID"]); |
1683 | prim.RezzerID = row["RezzerID"] == DBNull.Value ? UUID.Zero : new UUID((String)row["RezzerID"]); | ||
1682 | prim.OwnerMask = Convert.ToUInt32(row["OwnerMask"]); | 1684 | prim.OwnerMask = Convert.ToUInt32(row["OwnerMask"]); |
1683 | prim.NextOwnerMask = Convert.ToUInt32(row["NextOwnerMask"]); | 1685 | prim.NextOwnerMask = Convert.ToUInt32(row["NextOwnerMask"]); |
1684 | prim.GroupMask = Convert.ToUInt32(row["GroupMask"]); | 1686 | prim.GroupMask = Convert.ToUInt32(row["GroupMask"]); |
@@ -2125,6 +2127,7 @@ namespace OpenSim.Data.SQLite | |||
2125 | row["OwnerID"] = prim.OwnerID.ToString(); | 2127 | row["OwnerID"] = prim.OwnerID.ToString(); |
2126 | row["GroupID"] = prim.GroupID.ToString(); | 2128 | row["GroupID"] = prim.GroupID.ToString(); |
2127 | row["LastOwnerID"] = prim.LastOwnerID.ToString(); | 2129 | row["LastOwnerID"] = prim.LastOwnerID.ToString(); |
2130 | row["RezzerID"] = prim.RezzerID.ToString(); | ||
2128 | row["OwnerMask"] = prim.OwnerMask; | 2131 | row["OwnerMask"] = prim.OwnerMask; |
2129 | row["NextOwnerMask"] = prim.NextOwnerMask; | 2132 | row["NextOwnerMask"] = prim.NextOwnerMask; |
2130 | row["GroupMask"] = prim.GroupMask; | 2133 | row["GroupMask"] = prim.GroupMask; |