From 26fd6c741f74b51f6bd090b4e6e5140d28936c2b Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Tue, 2 Dec 2008 14:59:52 +0000 Subject: * Resolve http://opensimulator.org/mantis/view.php?id=2743 and http://opensimulator.org/mantis/view.php?id=2739 by no longer bothering to store or retrieve the local parentID in the region database * The original issue is that the now randomly generated local ids do not fit into the int parentID datatype * However, as far as I know it's actually pointless to store this local parent ID anyway (we already store the groupUUID), especially as we don't bother to store the localID (as opposed to UUID itself). * Conservatively, the actual column will be removed in a later commit --- OpenSim/Data/MySQL/MySQLRegionData.cs | 8 +++----- OpenSim/Data/SQLite/SQLiteRegionData.cs | 3 --- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs index 53b561d..8c49531 100644 --- a/OpenSim/Data/MySQL/MySQLRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLRegionData.cs @@ -163,7 +163,7 @@ namespace OpenSim.Data.MySQL cmd.Parameters.Clear(); cmd.CommandText = "replace into prims ("+ - "UUID, ParentID, CreationDate, "+ + "UUID, CreationDate, "+ "Name, Text, Description, "+ "SitName, TouchName, ObjectFlags, "+ "OwnerMask, NextOwnerMask, GroupMask, "+ @@ -196,7 +196,7 @@ namespace OpenSim.Data.MySQL "ColorR, ColorG, ColorB, ColorA, "+ "ParticleSystem, ClickAction, Material, "+ "CollisionSound, CollisionSoundVolume, "+ - "LinkNumber) values (" + "?UUID, ?ParentID, "+ + "LinkNumber) values (" + "?UUID, "+ "?CreationDate, ?Name, ?Text, "+ "?Description, ?SitName, ?TouchName, "+ "?ObjectFlags, ?OwnerMask, ?NextOwnerMask, "+ @@ -750,7 +750,6 @@ namespace OpenSim.Data.MySQL prim.UUID = new UUID((String) row["UUID"]); // explicit conversion of integers is required, which sort // of sucks. No idea if there is a shortcut here or not. - prim.ParentID = Convert.ToUInt32(row["ParentID"]); prim.CreationDate = Convert.ToInt32(row["CreationDate"]); prim.Name = (String) row["Name"]; // various text fields @@ -1067,7 +1066,7 @@ namespace OpenSim.Data.MySQL } /// - /// + /// Fill the prim command with prim values /// /// /// @@ -1077,7 +1076,6 @@ namespace OpenSim.Data.MySQL { cmd.Parameters.AddWithValue("UUID", Util.ToRawUuidString(prim.UUID)); cmd.Parameters.AddWithValue("RegionUUID", Util.ToRawUuidString(regionUUID)); - cmd.Parameters.AddWithValue("ParentID", prim.ParentID); cmd.Parameters.AddWithValue("CreationDate", prim.CreationDate); cmd.Parameters.AddWithValue("Name", prim.Name); cmd.Parameters.AddWithValue("SceneGroupID", Util.ToRawUuidString(sceneGroupID)); diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index b4b5ebb..cf6653a 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs @@ -783,7 +783,6 @@ namespace OpenSim.Data.SQLite createCol(prims, "UUID", typeof (String)); createCol(prims, "RegionUUID", typeof (String)); - createCol(prims, "ParentID", typeof (UInt32)); createCol(prims, "CreationDate", typeof (Int32)); createCol(prims, "Name", typeof (String)); createCol(prims, "SceneGroupID", typeof (String)); @@ -1118,7 +1117,6 @@ namespace OpenSim.Data.SQLite prim.UUID = new UUID((String) row["UUID"]); // explicit conversion of integers is required, which sort // of sucks. No idea if there is a shortcut here or not. - prim.ParentID = Convert.ToUInt32(row["ParentID"]); prim.CreationDate = Convert.ToInt32(row["CreationDate"]); prim.Name = (String) row["Name"]; // various text fields @@ -1454,7 +1452,6 @@ namespace OpenSim.Data.SQLite { row["UUID"] = Util.ToRawUuidString(prim.UUID); row["RegionUUID"] = Util.ToRawUuidString(regionUUID); - row["ParentID"] = prim.ParentID; row["CreationDate"] = prim.CreationDate; row["Name"] = prim.Name; row["SceneGroupID"] = Util.ToRawUuidString(sceneGroupID); -- cgit v1.1