From 27f7f76d042086933e0413236600f032b6105662 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey <jjustincc@googlemail.com>
Date: Fri, 28 Dec 2007 22:32:52 +0000
Subject: [PATCH] Move OpenSimAssetSet assets file up into assets pending
 further changes

---
 .../Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs   | 2 +-
 bin/{ => assets}/OpenSimAssetSet.xml                            | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename bin/{ => assets}/OpenSimAssetSet.xml (100%)

diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
index 6968956124..d15acf3da4 100644
--- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
+++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
@@ -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(), "OpenSimAssetSet.xml");
+            string filePath = Path.Combine(Util.configDir(), "assets/OpenSimAssetSet.xml");
             if (File.Exists(filePath))
             {
                 try
diff --git a/bin/OpenSimAssetSet.xml b/bin/assets/OpenSimAssetSet.xml
similarity index 100%
rename from bin/OpenSimAssetSet.xml
rename to bin/assets/OpenSimAssetSet.xml