aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clarke Casey2007-12-28 22:49:32 +0000
committerJustin Clarke Casey2007-12-28 22:49:32 +0000
commit505067658afe80fb3e8da1b44c73f993091ded10 (patch)
treefffdfc20d526ffc082d74ae22146f7b46b206b8a /OpenSim/Framework
parentMove OpenSimAssetSet assets file up into assets pending further changes (diff)
downloadopensim-SC_OLD-505067658afe80fb3e8da1b44c73f993091ded10.zip
opensim-SC_OLD-505067658afe80fb3e8da1b44c73f993091ded10.tar.gz
opensim-SC_OLD-505067658afe80fb3e8da1b44c73f993091ded10.tar.bz2
opensim-SC_OLD-505067658afe80fb3e8da1b44c73f993091ded10.tar.xz
Migrate opensim default assets up another directory in preparation for extraction of hardcoded asset locations into xml
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
index d15acf3..bffced8 100644
--- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
+++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
67 67
68 protected void LoadAsset(AssetBase info, bool image, string filename) 68 protected void LoadAsset(AssetBase info, bool image, string filename)
69 { 69 {
70 string dataPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder; 70 string dataPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets/OpenSimAssetSet"); //+ folder;
71 string fileName = Path.Combine(dataPath, filename); 71 string fileName = Path.Combine(dataPath, filename);
72 FileInfo fInfo = new FileInfo(fileName); 72 FileInfo fInfo = new FileInfo(fileName);
73 long numBytes = fInfo.Length; 73 long numBytes = fInfo.Length;
@@ -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(), "assets/OpenSimAssetSet.xml"); 88 string filePath = Path.Combine(Util.configDir(), "assets/OpenSimAssetSet/OpenSimAssetSet.xml");
89 if (File.Exists(filePath)) 89 if (File.Exists(filePath))
90 { 90 {
91 try 91 try