aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorCharles Krinke2008-12-01 15:03:57 +0000
committerCharles Krinke2008-12-01 15:03:57 +0000
commit01fc0492d07aa3a7476b538ba61c7725e2e85260 (patch)
treeaee12c8674662b02a1be1d5d4b8e48f48da3b28c /OpenSim
parentAdded a Catch(InvalidOperationException) to BaseHttpServer.HandleRequest(). W... (diff)
downloadopensim-SC_OLD-01fc0492d07aa3a7476b538ba61c7725e2e85260.zip
opensim-SC_OLD-01fc0492d07aa3a7476b538ba61c7725e2e85260.tar.gz
opensim-SC_OLD-01fc0492d07aa3a7476b538ba61c7725e2e85260.tar.bz2
opensim-SC_OLD-01fc0492d07aa3a7476b538ba61c7725e2e85260.tar.xz
Mantis#2730. Thank you kindly, StrawberryFride for a patch that:
MSSQL Fix to accommodate random ParentIDs. uint values now cleanly converted to ints and vice versa to hopefully prevent outofrange exceptions on prim storage.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLRegionData.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
index c29f566..c38e950 100644
--- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
@@ -930,7 +930,7 @@ VALUES
930 prim.UUID = new UUID((String)primRow["UUID"]); 930 prim.UUID = new UUID((String)primRow["UUID"]);
931 // explicit conversion of integers is required, which sort 931 // explicit conversion of integers is required, which sort
932 // of sucks. No idea if there is a shortcut here or not. 932 // of sucks. No idea if there is a shortcut here or not.
933 prim.ParentID = Convert.ToUInt32(primRow["ParentID"]); 933 prim.ParentID = (uint)Convert.ToInt32(primRow["ParentID"]);
934 prim.CreationDate = Convert.ToInt32(primRow["CreationDate"]); 934 prim.CreationDate = Convert.ToInt32(primRow["CreationDate"]);
935 prim.Name = (String)primRow["Name"]; 935 prim.Name = (String)primRow["Name"];
936 // various text fields 936 // various text fields
@@ -1307,7 +1307,7 @@ VALUES
1307 { 1307 {
1308 row["UUID"] = prim.UUID.ToString(); 1308 row["UUID"] = prim.UUID.ToString();
1309 row["RegionUUID"] = regionUUID.ToString(); 1309 row["RegionUUID"] = regionUUID.ToString();
1310 row["ParentID"] = prim.ParentID; 1310 row["ParentID"] = (int)prim.ParentID;
1311 row["CreationDate"] = prim.CreationDate; 1311 row["CreationDate"] = prim.CreationDate;
1312 row["Name"] = prim.Name; 1312 row["Name"] = prim.Name;
1313 row["SceneGroupID"] = sceneGroupID.ToString(); 1313 row["SceneGroupID"] = sceneGroupID.ToString();