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/SQLite/SQLiteRegionData.cs | |
parent | * reverted 7561 as the logger reference should always be private to the class... (diff) | |
download | opensim-SC-26fd6c741f74b51f6bd090b4e6e5140d28936c2b.zip opensim-SC-26fd6c741f74b51f6bd090b4e6e5140d28936c2b.tar.gz opensim-SC-26fd6c741f74b51f6bd090b4e6e5140d28936c2b.tar.bz2 opensim-SC-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 'OpenSim/Data/SQLite/SQLiteRegionData.cs')
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 3 |
1 files changed, 0 insertions, 3 deletions
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); |