diff options
author | Justin Clarke Casey | 2008-12-02 14:59:52 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-12-02 14:59:52 +0000 |
commit | 26fd6c741f74b51f6bd090b4e6e5140d28936c2b (patch) | |
tree | a87b059c1b2a4f8b58f0f22fa5e3fb37f18fcd41 /OpenSim/Data | |
parent | * reverted 7561 as the logger reference should always be private to the class... (diff) | |
download | opensim-SC_OLD-26fd6c741f74b51f6bd090b4e6e5140d28936c2b.zip opensim-SC_OLD-26fd6c741f74b51f6bd090b4e6e5140d28936c2b.tar.gz opensim-SC_OLD-26fd6c741f74b51f6bd090b4e6e5140d28936c2b.tar.bz2 opensim-SC_OLD-26fd6c741f74b51f6bd090b4e6e5140d28936c2b.tar.xz |
* 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
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLRegionData.cs | 8 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 3 |
2 files changed, 3 insertions, 8 deletions
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 | |||
163 | cmd.Parameters.Clear(); | 163 | cmd.Parameters.Clear(); |
164 | 164 | ||
165 | cmd.CommandText = "replace into prims ("+ | 165 | cmd.CommandText = "replace into prims ("+ |
166 | "UUID, ParentID, CreationDate, "+ | 166 | "UUID, CreationDate, "+ |
167 | "Name, Text, Description, "+ | 167 | "Name, Text, Description, "+ |
168 | "SitName, TouchName, ObjectFlags, "+ | 168 | "SitName, TouchName, ObjectFlags, "+ |
169 | "OwnerMask, NextOwnerMask, GroupMask, "+ | 169 | "OwnerMask, NextOwnerMask, GroupMask, "+ |
@@ -196,7 +196,7 @@ namespace OpenSim.Data.MySQL | |||
196 | "ColorR, ColorG, ColorB, ColorA, "+ | 196 | "ColorR, ColorG, ColorB, ColorA, "+ |
197 | "ParticleSystem, ClickAction, Material, "+ | 197 | "ParticleSystem, ClickAction, Material, "+ |
198 | "CollisionSound, CollisionSoundVolume, "+ | 198 | "CollisionSound, CollisionSoundVolume, "+ |
199 | "LinkNumber) values (" + "?UUID, ?ParentID, "+ | 199 | "LinkNumber) values (" + "?UUID, "+ |
200 | "?CreationDate, ?Name, ?Text, "+ | 200 | "?CreationDate, ?Name, ?Text, "+ |
201 | "?Description, ?SitName, ?TouchName, "+ | 201 | "?Description, ?SitName, ?TouchName, "+ |
202 | "?ObjectFlags, ?OwnerMask, ?NextOwnerMask, "+ | 202 | "?ObjectFlags, ?OwnerMask, ?NextOwnerMask, "+ |
@@ -750,7 +750,6 @@ namespace OpenSim.Data.MySQL | |||
750 | prim.UUID = new UUID((String) row["UUID"]); | 750 | prim.UUID = new UUID((String) row["UUID"]); |
751 | // explicit conversion of integers is required, which sort | 751 | // explicit conversion of integers is required, which sort |
752 | // of sucks. No idea if there is a shortcut here or not. | 752 | // of sucks. No idea if there is a shortcut here or not. |
753 | prim.ParentID = Convert.ToUInt32(row["ParentID"]); | ||
754 | prim.CreationDate = Convert.ToInt32(row["CreationDate"]); | 753 | prim.CreationDate = Convert.ToInt32(row["CreationDate"]); |
755 | prim.Name = (String) row["Name"]; | 754 | prim.Name = (String) row["Name"]; |
756 | // various text fields | 755 | // various text fields |
@@ -1067,7 +1066,7 @@ namespace OpenSim.Data.MySQL | |||
1067 | } | 1066 | } |
1068 | 1067 | ||
1069 | /// <summary> | 1068 | /// <summary> |
1070 | /// | 1069 | /// Fill the prim command with prim values |
1071 | /// </summary> | 1070 | /// </summary> |
1072 | /// <param name="row"></param> | 1071 | /// <param name="row"></param> |
1073 | /// <param name="prim"></param> | 1072 | /// <param name="prim"></param> |
@@ -1077,7 +1076,6 @@ namespace OpenSim.Data.MySQL | |||
1077 | { | 1076 | { |
1078 | cmd.Parameters.AddWithValue("UUID", Util.ToRawUuidString(prim.UUID)); | 1077 | cmd.Parameters.AddWithValue("UUID", Util.ToRawUuidString(prim.UUID)); |
1079 | cmd.Parameters.AddWithValue("RegionUUID", Util.ToRawUuidString(regionUUID)); | 1078 | cmd.Parameters.AddWithValue("RegionUUID", Util.ToRawUuidString(regionUUID)); |
1080 | cmd.Parameters.AddWithValue("ParentID", prim.ParentID); | ||
1081 | cmd.Parameters.AddWithValue("CreationDate", prim.CreationDate); | 1079 | cmd.Parameters.AddWithValue("CreationDate", prim.CreationDate); |
1082 | cmd.Parameters.AddWithValue("Name", prim.Name); | 1080 | cmd.Parameters.AddWithValue("Name", prim.Name); |
1083 | cmd.Parameters.AddWithValue("SceneGroupID", Util.ToRawUuidString(sceneGroupID)); | 1081 | 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 | |||
783 | 783 | ||
784 | createCol(prims, "UUID", typeof (String)); | 784 | createCol(prims, "UUID", typeof (String)); |
785 | createCol(prims, "RegionUUID", typeof (String)); | 785 | createCol(prims, "RegionUUID", typeof (String)); |
786 | createCol(prims, "ParentID", typeof (UInt32)); | ||
787 | createCol(prims, "CreationDate", typeof (Int32)); | 786 | createCol(prims, "CreationDate", typeof (Int32)); |
788 | createCol(prims, "Name", typeof (String)); | 787 | createCol(prims, "Name", typeof (String)); |
789 | createCol(prims, "SceneGroupID", typeof (String)); | 788 | createCol(prims, "SceneGroupID", typeof (String)); |
@@ -1118,7 +1117,6 @@ namespace OpenSim.Data.SQLite | |||
1118 | prim.UUID = new UUID((String) row["UUID"]); | 1117 | prim.UUID = new UUID((String) row["UUID"]); |
1119 | // explicit conversion of integers is required, which sort | 1118 | // explicit conversion of integers is required, which sort |
1120 | // of sucks. No idea if there is a shortcut here or not. | 1119 | // of sucks. No idea if there is a shortcut here or not. |
1121 | prim.ParentID = Convert.ToUInt32(row["ParentID"]); | ||
1122 | prim.CreationDate = Convert.ToInt32(row["CreationDate"]); | 1120 | prim.CreationDate = Convert.ToInt32(row["CreationDate"]); |
1123 | prim.Name = (String) row["Name"]; | 1121 | prim.Name = (String) row["Name"]; |
1124 | // various text fields | 1122 | // various text fields |
@@ -1454,7 +1452,6 @@ namespace OpenSim.Data.SQLite | |||
1454 | { | 1452 | { |
1455 | row["UUID"] = Util.ToRawUuidString(prim.UUID); | 1453 | row["UUID"] = Util.ToRawUuidString(prim.UUID); |
1456 | row["RegionUUID"] = Util.ToRawUuidString(regionUUID); | 1454 | row["RegionUUID"] = Util.ToRawUuidString(regionUUID); |
1457 | row["ParentID"] = prim.ParentID; | ||
1458 | row["CreationDate"] = prim.CreationDate; | 1455 | row["CreationDate"] = prim.CreationDate; |
1459 | row["Name"] = prim.Name; | 1456 | row["Name"] = prim.Name; |
1460 | row["SceneGroupID"] = Util.ToRawUuidString(sceneGroupID); | 1457 | row["SceneGroupID"] = Util.ToRawUuidString(sceneGroupID); |