aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares2007-12-20 23:37:41 +0000
committerTeravus Ovares2007-12-20 23:37:41 +0000
commit23f761231d5f041bf4ef361a85bfe3ce2a47ceb1 (patch)
treebc74ac2906dcca93f549750f444fc73cf211b13c
parent* Fixed implicit .ToString() in shape fetch. (diff)
downloadopensim-SC-23f761231d5f041bf4ef361a85bfe3ce2a47ceb1.zip
opensim-SC-23f761231d5f041bf4ef361a85bfe3ce2a47ceb1.tar.gz
opensim-SC-23f761231d5f041bf4ef361a85bfe3ce2a47ceb1.tar.bz2
opensim-SC-23f761231d5f041bf4ef361a85bfe3ce2a47ceb1.tar.xz
* and another :/
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLDataStore.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
index cdebac8..e74643d 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
@@ -156,7 +156,7 @@ namespace OpenSim.Framework.Data.MySQL
156 foreach (DataRow row in primRows) 156 foreach (DataRow row in primRows)
157 { 157 {
158 LLUUID uuid = new LLUUID((string)row["UUID"]); 158 LLUUID uuid = new LLUUID((string)row["UUID"]);
159 DataRow shapeRow = shapes.Rows.Find(uuid); 159 DataRow shapeRow = shapes.Rows.Find(Util.ToRawUuidString(uuid));
160 if (shapeRow != null) 160 if (shapeRow != null)
161 { 161 {
162 shapeRow.Delete(); 162 shapeRow.Delete();
@@ -919,7 +919,7 @@ namespace OpenSim.Framework.Data.MySQL
919 DataTable prims = m_dataSet.Tables["prims"]; 919 DataTable prims = m_dataSet.Tables["prims"];
920 DataTable shapes = m_dataSet.Tables["primshapes"]; 920 DataTable shapes = m_dataSet.Tables["primshapes"];
921 921
922 DataRow primRow = prims.Rows.Find(prim.UUID); 922 DataRow primRow = prims.Rows.Find(Util.ToRawUuidString(prim.UUID));
923 if (primRow == null) 923 if (primRow == null)
924 { 924 {
925 primRow = prims.NewRow(); 925 primRow = prims.NewRow();