aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
diff options
context:
space:
mode:
authorTeravus Ovares2007-12-20 23:25:19 +0000
committerTeravus Ovares2007-12-20 23:25:19 +0000
commit97c78ce0fd4688b85ac5bb7b349af43dc6be863e (patch)
treef1b67b8774e98e5cfd0d5be1d359e93e8b57ea2d /OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
parentRevert a couple of UUIDs back to hyphenated since we actually sometimes store... (diff)
downloadopensim-SC_OLD-97c78ce0fd4688b85ac5bb7b349af43dc6be863e.zip
opensim-SC_OLD-97c78ce0fd4688b85ac5bb7b349af43dc6be863e.tar.gz
opensim-SC_OLD-97c78ce0fd4688b85ac5bb7b349af43dc6be863e.tar.bz2
opensim-SC_OLD-97c78ce0fd4688b85ac5bb7b349af43dc6be863e.tar.xz
* fixed a few Implicit uses of .ToString()
Diffstat (limited to 'OpenSim/Framework/Data.MySQL/MySQLDataStore.cs')
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLDataStore.cs18
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
index dcf7adc..b80dde8 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs
@@ -754,12 +754,12 @@ namespace OpenSim.Framework.Data.MySQL
754 754
755 private void fillPrimRow(DataRow row, SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID) 755 private void fillPrimRow(DataRow row, SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID)
756 { 756 {
757 row["UUID"] = prim.UUID; 757 row["UUID"] = Util.ToRawUuidString(prim.UUID);
758 row["RegionUUID"] = regionUUID; 758 row["RegionUUID"] = Util.ToRawUuidString(regionUUID);
759 row["ParentID"] = prim.ParentID; 759 row["ParentID"] = prim.ParentID;
760 row["CreationDate"] = prim.CreationDate; 760 row["CreationDate"] = prim.CreationDate;
761 row["Name"] = prim.Name; 761 row["Name"] = prim.Name;
762 row["SceneGroupID"] = sceneGroupID; // the UUID of the root part for this SceneObjectGroup 762 row["SceneGroupID"] = Util.ToRawUuidString(sceneGroupID); // the UUID of the root part for this SceneObjectGroup
763 // various text fields 763 // various text fields
764 row["Text"] = prim.Text; 764 row["Text"] = prim.Text;
765 row["Description"] = prim.Description; 765 row["Description"] = prim.Description;
@@ -767,10 +767,10 @@ namespace OpenSim.Framework.Data.MySQL
767 row["TouchName"] = prim.TouchName; 767 row["TouchName"] = prim.TouchName;
768 // permissions 768 // permissions
769 row["ObjectFlags"] = prim.ObjectFlags; 769 row["ObjectFlags"] = prim.ObjectFlags;
770 row["CreatorID"] = prim.CreatorID; 770 row["CreatorID"] = Util.ToRawUuidString(prim.CreatorID);
771 row["OwnerID"] = prim.OwnerID; 771 row["OwnerID"] = Util.ToRawUuidString(prim.OwnerID);
772 row["GroupID"] = prim.GroupID; 772 row["GroupID"] = Util.ToRawUuidString(prim.GroupID);
773 row["LastOwnerID"] = prim.LastOwnerID; 773 row["LastOwnerID"] = Util.ToRawUuidString(prim.LastOwnerID);
774 row["OwnerMask"] = prim.OwnerMask; 774 row["OwnerMask"] = prim.OwnerMask;
775 row["NextOwnerMask"] = prim.NextOwnerMask; 775 row["NextOwnerMask"] = prim.NextOwnerMask;
776 row["GroupMask"] = prim.GroupMask; 776 row["GroupMask"] = prim.GroupMask;
@@ -882,7 +882,7 @@ namespace OpenSim.Framework.Data.MySQL
882 private void fillShapeRow(DataRow row, SceneObjectPart prim) 882 private void fillShapeRow(DataRow row, SceneObjectPart prim)
883 { 883 {
884 PrimitiveBaseShape s = prim.Shape; 884 PrimitiveBaseShape s = prim.Shape;
885 row["UUID"] = prim.UUID; 885 row["UUID"] = Util.ToRawUuidString(prim.UUID);
886 // shape is an enum 886 // shape is an enum
887 row["Shape"] = 0; 887 row["Shape"] = 0;
888 // vectors 888 // vectors
@@ -931,7 +931,7 @@ namespace OpenSim.Framework.Data.MySQL
931 fillPrimRow(primRow, prim, sceneGroupID, regionUUID); 931 fillPrimRow(primRow, prim, sceneGroupID, regionUUID);
932 } 932 }
933 933
934 DataRow shapeRow = shapes.Rows.Find(prim.UUID); 934 DataRow shapeRow = shapes.Rows.Find(Util.ToRawUuidString(prim.UUID));
935 if (shapeRow == null) 935 if (shapeRow == null)
936 { 936 {
937 shapeRow = shapes.NewRow(); 937 shapeRow = shapes.NewRow();