Migrate opensim default assets up another directory in preparation for extraction of hardcoded asset locations into xml

afrisby
Justin Clarke Casey 2007-12-28 22:49:32 +00:00
parent 27f7f76d04
commit 505067658a
74 changed files with 2 additions and 2 deletions

View File

@ -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