mirror of
https://github.com/opensim/opensim.git
synced 2026-08-12 12:25:42 +08:00
* Drop InvType from the assets table since it is no longer used
* Migration should be automatic on sqlite and mysql * Migration is not automatic on mssql, you will need to drop the invType column manually * Migration should be fine, but as for any db change, I would recommend making sure you have backups before moving past this revision
This commit is contained in:
@@ -223,7 +223,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
|
||||
rdata.writer.WriteAttributeString("name", asset.Name);
|
||||
rdata.writer.WriteAttributeString("desc", asset.Description);
|
||||
rdata.writer.WriteAttributeString("type", asset.Type.ToString());
|
||||
rdata.writer.WriteAttributeString("invtype", asset.InvType.ToString());
|
||||
rdata.writer.WriteAttributeString("local", asset.Local.ToString());
|
||||
rdata.writer.WriteAttributeString("temporary", asset.Temporary.ToString());
|
||||
|
||||
|
||||
@@ -1492,7 +1492,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
|
||||
|
||||
private void CollectAsset(XmlInventoryCollection ic)
|
||||
{
|
||||
|
||||
Rest.Log.DebugFormat("{0} Interpret asset element", MsgId);
|
||||
|
||||
AssetBase asset = null;
|
||||
@@ -1500,7 +1499,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
|
||||
string name = String.Empty;
|
||||
string desc = String.Empty;
|
||||
sbyte type = (sbyte) AssetType.Unknown;
|
||||
sbyte itype = (sbyte) AssetType.Unknown;
|
||||
bool temp = false;
|
||||
bool local = false;
|
||||
|
||||
@@ -1534,10 +1532,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
|
||||
temp = Boolean.Parse(ic.xml.Value);
|
||||
break;
|
||||
|
||||
case "invtype" :
|
||||
itype = SByte.Parse(ic.xml.Value);
|
||||
break;
|
||||
|
||||
case "uuid" :
|
||||
uuid = new LLUUID(ic.xml.Value);
|
||||
break;
|
||||
@@ -1603,7 +1597,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
|
||||
|
||||
asset.Description = desc;
|
||||
asset.Type = type; // type == 0 == texture
|
||||
asset.InvType = itype;
|
||||
asset.Local = local;
|
||||
asset.Temporary = temp;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user