diff options
author | Justin Clarke Casey | 2008-07-02 16:20:54 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-07-02 16:20:54 +0000 |
commit | 9052c43319ab69f57b80e363d965780be625b0e2 (patch) | |
tree | 3e17e9c0908be54ecb01ddff824d6c1a32020e88 /OpenSim/ApplicationPlugins/Rest | |
parent | Mantis#1647. Thank you kindly, Sempuki for a patch that: (diff) | |
download | opensim-SC_OLD-9052c43319ab69f57b80e363d965780be625b0e2.zip opensim-SC_OLD-9052c43319ab69f57b80e363d965780be625b0e2.tar.gz opensim-SC_OLD-9052c43319ab69f57b80e363d965780be625b0e2.tar.bz2 opensim-SC_OLD-9052c43319ab69f57b80e363d965780be625b0e2.tar.xz |
* 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
Diffstat (limited to '')
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs | 1 | ||||
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs index 839e0f2..0fc937f 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs | |||
@@ -223,7 +223,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
223 | rdata.writer.WriteAttributeString("name", asset.Name); | 223 | rdata.writer.WriteAttributeString("name", asset.Name); |
224 | rdata.writer.WriteAttributeString("desc", asset.Description); | 224 | rdata.writer.WriteAttributeString("desc", asset.Description); |
225 | rdata.writer.WriteAttributeString("type", asset.Type.ToString()); | 225 | rdata.writer.WriteAttributeString("type", asset.Type.ToString()); |
226 | rdata.writer.WriteAttributeString("invtype", asset.InvType.ToString()); | ||
227 | rdata.writer.WriteAttributeString("local", asset.Local.ToString()); | 226 | rdata.writer.WriteAttributeString("local", asset.Local.ToString()); |
228 | rdata.writer.WriteAttributeString("temporary", asset.Temporary.ToString()); | 227 | rdata.writer.WriteAttributeString("temporary", asset.Temporary.ToString()); |
229 | 228 | ||
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs index 0fc10f9..780d218 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | |||
@@ -1492,7 +1492,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
1492 | 1492 | ||
1493 | private void CollectAsset(XmlInventoryCollection ic) | 1493 | private void CollectAsset(XmlInventoryCollection ic) |
1494 | { | 1494 | { |
1495 | |||
1496 | Rest.Log.DebugFormat("{0} Interpret asset element", MsgId); | 1495 | Rest.Log.DebugFormat("{0} Interpret asset element", MsgId); |
1497 | 1496 | ||
1498 | AssetBase asset = null; | 1497 | AssetBase asset = null; |
@@ -1500,7 +1499,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
1500 | string name = String.Empty; | 1499 | string name = String.Empty; |
1501 | string desc = String.Empty; | 1500 | string desc = String.Empty; |
1502 | sbyte type = (sbyte) AssetType.Unknown; | 1501 | sbyte type = (sbyte) AssetType.Unknown; |
1503 | sbyte itype = (sbyte) AssetType.Unknown; | ||
1504 | bool temp = false; | 1502 | bool temp = false; |
1505 | bool local = false; | 1503 | bool local = false; |
1506 | 1504 | ||
@@ -1534,10 +1532,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
1534 | temp = Boolean.Parse(ic.xml.Value); | 1532 | temp = Boolean.Parse(ic.xml.Value); |
1535 | break; | 1533 | break; |
1536 | 1534 | ||
1537 | case "invtype" : | ||
1538 | itype = SByte.Parse(ic.xml.Value); | ||
1539 | break; | ||
1540 | |||
1541 | case "uuid" : | 1535 | case "uuid" : |
1542 | uuid = new LLUUID(ic.xml.Value); | 1536 | uuid = new LLUUID(ic.xml.Value); |
1543 | break; | 1537 | break; |
@@ -1603,7 +1597,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
1603 | 1597 | ||
1604 | asset.Description = desc; | 1598 | asset.Description = desc; |
1605 | asset.Type = type; // type == 0 == texture | 1599 | asset.Type = type; // type == 0 == texture |
1606 | asset.InvType = itype; | ||
1607 | asset.Local = local; | 1600 | asset.Local = local; |
1608 | asset.Temporary = temp; | 1601 | asset.Temporary = temp; |
1609 | 1602 | ||