aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/AssetLoader/Filesystem
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-06-23 18:01:58 +0000
committerJustin Clarke Casey2008-06-23 18:01:58 +0000
commitde243802334c44967273be2d1455a5f191f75955 (patch)
tree7228d224717ff5b5c021161225ac9f4e46b39174 /OpenSim/Framework/AssetLoader/Filesystem
parentadd migration to go from varchar -> char for uuid. Tested (diff)
downloadopensim-SC-de243802334c44967273be2d1455a5f191f75955.zip
opensim-SC-de243802334c44967273be2d1455a5f191f75955.tar.gz
opensim-SC-de243802334c44967273be2d1455a5f191f75955.tar.bz2
opensim-SC-de243802334c44967273be2d1455a5f191f75955.tar.xz
* Remove all use of asset.InvType, as outlined in mailing list discussion
* This is stage 1, the field will be removed from AssetType and the assets table if this change doesn't prove problematic
Diffstat (limited to 'OpenSim/Framework/AssetLoader/Filesystem')
-rw-r--r--OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs2
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
index 7adcb4a..ba23d82 100644
--- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
+++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
@@ -137,13 +137,11 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
137 string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToString()); 137 string assetIdStr = source.Configs[i].GetString("assetID", LLUUID.Random().ToString());
138 string name = source.Configs[i].GetString("name", String.Empty); 138 string name = source.Configs[i].GetString("name", String.Empty);
139 sbyte type = (sbyte) source.Configs[i].GetInt("assetType", 0); 139 sbyte type = (sbyte) source.Configs[i].GetInt("assetType", 0);
140 sbyte invType = (sbyte) source.Configs[i].GetInt("inventoryType", 0);
141 string assetPath = Path.Combine(dir, source.Configs[i].GetString("fileName", String.Empty)); 140 string assetPath = Path.Combine(dir, source.Configs[i].GetString("fileName", String.Empty));
142 141
143 AssetBase newAsset = CreateAsset(assetIdStr, name, assetPath, false); 142 AssetBase newAsset = CreateAsset(assetIdStr, name, assetPath, false);
144 143
145 newAsset.Type = type; 144 newAsset.Type = type;
146 newAsset.InvType = invType;
147 assets.Add(newAsset); 145 assets.Add(newAsset);
148 } 146 }
149 } 147 }