From 505067658afe80fb3e8da1b44c73f993091ded10 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 28 Dec 2007 22:49:32 +0000
Subject: Migrate opensim default assets up another directory in preparation
 for extraction of hardcoded asset locations into xml

---
 OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

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
         
         protected void LoadAsset(AssetBase info, bool image, string filename)
         {
-            string dataPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder;
+            string dataPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets/OpenSimAssetSet"); //+ folder;
             string fileName = Path.Combine(dataPath, filename);
             FileInfo fInfo = new FileInfo(fileName);
             long numBytes = fInfo.Length;
@@ -85,7 +85,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
         {
             List<AssetBase> assets = new List<AssetBase>();
             // System.Console.WriteLine("trying loading asset into database");
-            string filePath = Path.Combine(Util.configDir(), "assets/OpenSimAssetSet.xml");
+            string filePath = Path.Combine(Util.configDir(), "assets/OpenSimAssetSet/OpenSimAssetSet.xml");
             if (File.Exists(filePath))
             {
                 try
-- 
cgit v1.1