mirror of
https://github.com/opensim/opensim.git
synced 2026-08-08 18:25:33 +08:00
very useless changes
This commit is contained in:
@@ -341,6 +341,7 @@ namespace OpenSim.Data.MySQL
|
||||
while (reader.Read())
|
||||
{
|
||||
SceneObjectPart prim = BuildPrim(reader);
|
||||
|
||||
if (reader["Shape"] is DBNull)
|
||||
prim.Shape = PrimitiveBaseShape.Default;
|
||||
else
|
||||
|
||||
@@ -295,7 +295,6 @@ namespace OpenSim.Data.MySQL
|
||||
ad.SimName = reader.GetString("simname");
|
||||
ad.GlobalPos = reader.GetString("posglobal");
|
||||
ad.ParcelName = reader.GetString("parcelname");
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -174,7 +174,7 @@ namespace OpenSim.Data.PGSQL
|
||||
{
|
||||
return (bool)value;
|
||||
}
|
||||
if (valueType == typeof(Byte[]))
|
||||
if (valueType == typeof(byte[]))
|
||||
{
|
||||
return value;
|
||||
}
|
||||
|
||||
@@ -139,7 +139,7 @@ CREATE TABLE Tmp_inventoryitems
|
||||
|
||||
|
||||
INSERT INTO Tmp_inventoryitems ("inventoryID", "assetID", "assetType", "parentFolderID", "avatarID", "inventoryName", "inventoryDescription", "inventoryNextPermissions", "inventoryCurrentPermissions", "invType", "creatorID", "inventoryBasePermissions", "inventoryEveryOnePermissions", "salePrice", "SaleType", "creationDate", "groupID", "groupOwned", "flags", "inventoryGroupPermissions")
|
||||
SELECT cast("inventoryID" as uuid), cast("assetID" as uuid), "assetType", cast("parentFolderID" as uuid), cast("avatarID" as uuid), "inventoryName", "inventoryDescription", "inventoryNextPermissions", "inventoryCurrentPermissions", "invType", cast("creatorID" as uuid), "inventoryBasePermissions", "inventoryEveryOnePermissions", "salePrice", "SaleType", "creationDate", cast("groupID" as uuid), "groupOwned", "flags", "inventoryGroupPermissions"
|
||||
SELECT cast("inventoryID" as uuid), cast("assetID" as uuid), "assetType", cast("parentFolderID" as uuid), cast("avatarID" as uuid), "inventoryName", "inventoryDescription", "inventoryNextPermissions", "inventoryCurrentPermissions", "invType", cast("creatorID" as uuid), "inventoryBasePermissions", "inventoryEveryOnePermissions", "salePrice", "saleType", "creationDate", cast("groupID" as uuid), "groupOwned", "flags", "inventoryGroupPermissions"
|
||||
FROM inventoryitems ;
|
||||
|
||||
DROP TABLE inventoryitems;
|
||||
|
||||
@@ -669,8 +669,6 @@ namespace OpenSim.Data.SQLite
|
||||
createdObjects.Add(group.UUID, group);
|
||||
retvals.Add(group);
|
||||
LoadItems(prim);
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
@@ -1301,8 +1299,8 @@ namespace OpenSim.Data.SQLite
|
||||
createCol(shapes, "LastAttachPoint", typeof(Int32));
|
||||
// text TODO: this isn't right, but I'm not sure the right
|
||||
// way to specify this as a blob atm
|
||||
createCol(shapes, "Texture", typeof(Byte[]));
|
||||
createCol(shapes, "ExtraParams", typeof(Byte[]));
|
||||
createCol(shapes, "Texture", typeof(byte[]));
|
||||
createCol(shapes, "ExtraParams", typeof(byte[]));
|
||||
createCol(shapes, "Media", typeof(String));
|
||||
createCol(shapes, "MatOvrd", typeof(byte[]));
|
||||
shapes.PrimaryKey = new DataColumn[] { shapes.Columns["UUID"] };
|
||||
|
||||
Reference in New Issue
Block a user