aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs8
-rw-r--r--OpenSim/Framework/TaskInventoryItem.cs4
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
index 00b0acb..96dd5ac 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs
@@ -690,8 +690,8 @@ namespace OpenSim.Framework.Data.SQLite
690 createCol(items, "assetID", typeof (String)); 690 createCol(items, "assetID", typeof (String));
691 createCol(items, "parentFolderID", typeof (String)); 691 createCol(items, "parentFolderID", typeof (String));
692 692
693 createCol(items, "invType", typeof (String)); 693 createCol(items, "invType", typeof (Int32));
694 createCol(items, "assetType", typeof (String)); 694 createCol(items, "assetType", typeof (Int32));
695 695
696 createCol(items, "name", typeof (String)); 696 createCol(items, "name", typeof (String));
697 createCol(items, "description", typeof (String)); 697 createCol(items, "description", typeof (String));
@@ -895,8 +895,8 @@ namespace OpenSim.Framework.Data.SQLite
895 taskItem.asset_id = new LLUUID((String)row["assetID"]); 895 taskItem.asset_id = new LLUUID((String)row["assetID"]);
896 taskItem.parent_id = new LLUUID((String)row["parentFolderID"]); 896 taskItem.parent_id = new LLUUID((String)row["parentFolderID"]);
897 897
898 taskItem.inv_type = (String)row["invType"]; 898 taskItem.inv_type = Convert.ToInt32(row["invType"]);
899 taskItem.type = (String)row["assetType"]; 899 taskItem.type = Convert.ToInt32(row["assetType"]);
900 900
901 taskItem.name = (String)row["name"]; 901 taskItem.name = (String)row["name"];
902 taskItem.desc = (String)row["description"]; 902 taskItem.desc = (String)row["description"];
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index e1eac79..196e096 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -89,8 +89,8 @@ namespace OpenSim.Framework
89 public LLUUID group_id = LLUUID.Zero; 89 public LLUUID group_id = LLUUID.Zero;
90 90
91 public LLUUID asset_id = LLUUID.Zero; 91 public LLUUID asset_id = LLUUID.Zero;
92 public string type = ""; 92 public int type = 0;
93 public string inv_type = ""; 93 public int inv_type = 0;
94 public uint flags = 0; 94 public uint flags = 0;
95 public string name = ""; 95 public string name = "";
96 public string desc = ""; 96 public string desc = "";