diff options
| author | Justin Clarke Casey | 2007-12-28 22:32:52 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2007-12-28 22:32:52 +0000 |
| commit | 27f7f76d042086933e0413236600f032b6105662 (patch) | |
| tree | 85a62342cc1035c47a44dd9f2fbd31486c888b44 | |
| parent | Remove now dead code (diff) | |
| download | opensim-SC-27f7f76d042086933e0413236600f032b6105662.zip opensim-SC-27f7f76d042086933e0413236600f032b6105662.tar.gz opensim-SC-27f7f76d042086933e0413236600f032b6105662.tar.bz2 opensim-SC-27f7f76d042086933e0413236600f032b6105662.tar.xz | |
Move OpenSimAssetSet assets file up into assets pending further changes
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs | 2 | ||||
| -rw-r--r-- | bin/assets/OpenSimAssetSet.xml (renamed from bin/OpenSimAssetSet.xml) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs index 6968956..d15acf3 100644 --- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs +++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs | |||
| @@ -85,7 +85,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem | |||
| 85 | { | 85 | { |
| 86 | List<AssetBase> assets = new List<AssetBase>(); | 86 | List<AssetBase> assets = new List<AssetBase>(); |
| 87 | // System.Console.WriteLine("trying loading asset into database"); | 87 | // System.Console.WriteLine("trying loading asset into database"); |
| 88 | string filePath = Path.Combine(Util.configDir(), "OpenSimAssetSet.xml"); | 88 | string filePath = Path.Combine(Util.configDir(), "assets/OpenSimAssetSet.xml"); |
| 89 | if (File.Exists(filePath)) | 89 | if (File.Exists(filePath)) |
| 90 | { | 90 | { |
| 91 | try | 91 | try |
diff --git a/bin/OpenSimAssetSet.xml b/bin/assets/OpenSimAssetSet.xml index 21e298a..21e298a 100644 --- a/bin/OpenSimAssetSet.xml +++ b/bin/assets/OpenSimAssetSet.xml | |||