* fixed a few Implicit uses of .ToString()
parent
e2fa5efb59
commit
97c78ce0fd
|
@ -754,12 +754,12 @@ namespace OpenSim.Framework.Data.MySQL
|
||||||
|
|
||||||
private void fillPrimRow(DataRow row, SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID)
|
private void fillPrimRow(DataRow row, SceneObjectPart prim, LLUUID sceneGroupID, LLUUID regionUUID)
|
||||||
{
|
{
|
||||||
row["UUID"] = prim.UUID;
|
row["UUID"] = Util.ToRawUuidString(prim.UUID);
|
||||||
row["RegionUUID"] = regionUUID;
|
row["RegionUUID"] = Util.ToRawUuidString(regionUUID);
|
||||||
row["ParentID"] = prim.ParentID;
|
row["ParentID"] = prim.ParentID;
|
||||||
row["CreationDate"] = prim.CreationDate;
|
row["CreationDate"] = prim.CreationDate;
|
||||||
row["Name"] = prim.Name;
|
row["Name"] = prim.Name;
|
||||||
row["SceneGroupID"] = sceneGroupID; // the UUID of the root part for this SceneObjectGroup
|
row["SceneGroupID"] = Util.ToRawUuidString(sceneGroupID); // the UUID of the root part for this SceneObjectGroup
|
||||||
// various text fields
|
// various text fields
|
||||||
row["Text"] = prim.Text;
|
row["Text"] = prim.Text;
|
||||||
row["Description"] = prim.Description;
|
row["Description"] = prim.Description;
|
||||||
|
@ -767,10 +767,10 @@ namespace OpenSim.Framework.Data.MySQL
|
||||||
row["TouchName"] = prim.TouchName;
|
row["TouchName"] = prim.TouchName;
|
||||||
// permissions
|
// permissions
|
||||||
row["ObjectFlags"] = prim.ObjectFlags;
|
row["ObjectFlags"] = prim.ObjectFlags;
|
||||||
row["CreatorID"] = prim.CreatorID;
|
row["CreatorID"] = Util.ToRawUuidString(prim.CreatorID);
|
||||||
row["OwnerID"] = prim.OwnerID;
|
row["OwnerID"] = Util.ToRawUuidString(prim.OwnerID);
|
||||||
row["GroupID"] = prim.GroupID;
|
row["GroupID"] = Util.ToRawUuidString(prim.GroupID);
|
||||||
row["LastOwnerID"] = prim.LastOwnerID;
|
row["LastOwnerID"] = Util.ToRawUuidString(prim.LastOwnerID);
|
||||||
row["OwnerMask"] = prim.OwnerMask;
|
row["OwnerMask"] = prim.OwnerMask;
|
||||||
row["NextOwnerMask"] = prim.NextOwnerMask;
|
row["NextOwnerMask"] = prim.NextOwnerMask;
|
||||||
row["GroupMask"] = prim.GroupMask;
|
row["GroupMask"] = prim.GroupMask;
|
||||||
|
@ -882,7 +882,7 @@ namespace OpenSim.Framework.Data.MySQL
|
||||||
private void fillShapeRow(DataRow row, SceneObjectPart prim)
|
private void fillShapeRow(DataRow row, SceneObjectPart prim)
|
||||||
{
|
{
|
||||||
PrimitiveBaseShape s = prim.Shape;
|
PrimitiveBaseShape s = prim.Shape;
|
||||||
row["UUID"] = prim.UUID;
|
row["UUID"] = Util.ToRawUuidString(prim.UUID);
|
||||||
// shape is an enum
|
// shape is an enum
|
||||||
row["Shape"] = 0;
|
row["Shape"] = 0;
|
||||||
// vectors
|
// vectors
|
||||||
|
@ -931,7 +931,7 @@ namespace OpenSim.Framework.Data.MySQL
|
||||||
fillPrimRow(primRow, prim, sceneGroupID, regionUUID);
|
fillPrimRow(primRow, prim, sceneGroupID, regionUUID);
|
||||||
}
|
}
|
||||||
|
|
||||||
DataRow shapeRow = shapes.Rows.Find(prim.UUID);
|
DataRow shapeRow = shapes.Rows.Find(Util.ToRawUuidString(prim.UUID));
|
||||||
if (shapeRow == null)
|
if (shapeRow == null)
|
||||||
{
|
{
|
||||||
shapeRow = shapes.NewRow();
|
shapeRow = shapes.NewRow();
|
||||||
|
|
Loading…
Reference in New Issue