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

74 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
         
         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
diff --git a/bin/assets/4-tile2.jp2 b/bin/assets/OpenSimAssetSet/4-tile2.jp2
index 8c63104..8c63104 100644
--- a/bin/assets/4-tile2.jp2
+++ b/bin/assets/OpenSimAssetSet/4-tile2.jp2
diff --git a/bin/assets/4-tile3.jp2 b/bin/assets/OpenSimAssetSet/4-tile3.jp2
index 7890364..7890364 100644
--- a/bin/assets/4-tile3.jp2
+++ b/bin/assets/OpenSimAssetSet/4-tile3.jp2
diff --git a/bin/assets/OpenSimAssetSet.xml b/bin/assets/OpenSimAssetSet/OpenSimAssetSet.xml
index 21e298a..21e298a 100644
--- a/bin/assets/OpenSimAssetSet.xml
+++ b/bin/assets/OpenSimAssetSet/OpenSimAssetSet.xml
diff --git a/bin/assets/base_shape.dat b/bin/assets/OpenSimAssetSet/base_shape.dat
index d9a361f..d9a361f 100644
--- a/bin/assets/base_shape.dat
+++ b/bin/assets/OpenSimAssetSet/base_shape.dat
diff --git a/bin/assets/base_skin.dat b/bin/assets/OpenSimAssetSet/base_skin.dat
index c51aeb8..c51aeb8 100644
--- a/bin/assets/base_skin.dat
+++ b/bin/assets/OpenSimAssetSet/base_skin.dat
diff --git a/bin/assets/brick1_256.jp2 b/bin/assets/OpenSimAssetSet/brick1_256.jp2
index a632282..a632282 100644
--- a/bin/assets/brick1_256.jp2
+++ b/bin/assets/OpenSimAssetSet/brick1_256.jp2
diff --git a/bin/assets/brick2_256.jp2 b/bin/assets/OpenSimAssetSet/brick2_256.jp2
index efe0a9e..efe0a9e 100644
--- a/bin/assets/brick2_256.jp2
+++ b/bin/assets/OpenSimAssetSet/brick2_256.jp2
diff --git a/bin/assets/brick_mono.jp2 b/bin/assets/OpenSimAssetSet/brick_mono.jp2
index b250960..b250960 100644
--- a/bin/assets/brick_mono.jp2
+++ b/bin/assets/OpenSimAssetSet/brick_mono.jp2
diff --git a/bin/assets/bricks.jp2 b/bin/assets/OpenSimAssetSet/bricks.jp2
index 6113881..6113881 100644
--- a/bin/assets/bricks.jp2
+++ b/bin/assets/OpenSimAssetSet/bricks.jp2
diff --git a/bin/assets/cedar.jp2 b/bin/assets/OpenSimAssetSet/cedar.jp2
index 2894e3b..2894e3b 100644
--- a/bin/assets/cedar.jp2
+++ b/bin/assets/OpenSimAssetSet/cedar.jp2
diff --git a/bin/assets/cement_block.jp2 b/bin/assets/OpenSimAssetSet/cement_block.jp2
index 971daac..971daac 100644
--- a/bin/assets/cement_block.jp2
+++ b/bin/assets/OpenSimAssetSet/cement_block.jp2
diff --git a/bin/assets/clear.jp2 b/bin/assets/OpenSimAssetSet/clear.jp2
index e4a29fc..e4a29fc 100644
--- a/bin/assets/clear.jp2
+++ b/bin/assets/OpenSimAssetSet/clear.jp2
diff --git a/bin/assets/cloud.jp2 b/bin/assets/OpenSimAssetSet/cloud.jp2
index aa24cdd..aa24cdd 100644
--- a/bin/assets/cloud.jp2
+++ b/bin/assets/OpenSimAssetSet/cloud.jp2
diff --git a/bin/assets/cobbles.jp2 b/bin/assets/OpenSimAssetSet/cobbles.jp2
index 0bcc38f..0bcc38f 100644
--- a/bin/assets/cobbles.jp2
+++ b/bin/assets/OpenSimAssetSet/cobbles.jp2
diff --git a/bin/assets/coffee.jp2 b/bin/assets/OpenSimAssetSet/coffee.jp2
index 5761e8e..5761e8e 100644
--- a/bin/assets/coffee.jp2
+++ b/bin/assets/OpenSimAssetSet/coffee.jp2
diff --git a/bin/assets/creambrick.jp2 b/bin/assets/OpenSimAssetSet/creambrick.jp2
index a3c22e1..a3c22e1 100644
--- a/bin/assets/creambrick.jp2
+++ b/bin/assets/OpenSimAssetSet/creambrick.jp2
diff --git a/bin/assets/femalebody.jp2 b/bin/assets/OpenSimAssetSet/femalebody.jp2
index a50498f..a50498f 100644
--- a/bin/assets/femalebody.jp2
+++ b/bin/assets/OpenSimAssetSet/femalebody.jp2
diff --git a/bin/assets/femalebottom.jp2 b/bin/assets/OpenSimAssetSet/femalebottom.jp2
index 88908c6..88908c6 100644
--- a/bin/assets/femalebottom.jp2
+++ b/bin/assets/OpenSimAssetSet/femalebottom.jp2
diff --git a/bin/assets/femaleface.jp2 b/bin/assets/OpenSimAssetSet/femaleface.jp2
index 7bd0cb0..7bd0cb0 100644
--- a/bin/assets/femaleface.jp2
+++ b/bin/assets/OpenSimAssetSet/femaleface.jp2
diff --git a/bin/assets/fgrass.jp2 b/bin/assets/OpenSimAssetSet/fgrass.jp2
index fb496aa..fb496aa 100644
--- a/bin/assets/fgrass.jp2
+++ b/bin/assets/OpenSimAssetSet/fgrass.jp2
diff --git a/bin/assets/glasstile2.jp2 b/bin/assets/OpenSimAssetSet/glasstile2.jp2
index 9f62da7..9f62da7 100644
--- a/bin/assets/glasstile2.jp2
+++ b/bin/assets/OpenSimAssetSet/glasstile2.jp2
diff --git a/bin/assets/goblin_skin.dat b/bin/assets/OpenSimAssetSet/goblin_skin.dat
index 7a7ad8b..7a7ad8b 100644
--- a/bin/assets/goblin_skin.dat
+++ b/bin/assets/OpenSimAssetSet/goblin_skin.dat
diff --git a/bin/assets/granite.jp2 b/bin/assets/OpenSimAssetSet/granite.jp2
index 6113881..6113881 100644
--- a/bin/assets/granite.jp2
+++ b/bin/assets/OpenSimAssetSet/granite.jp2
diff --git a/bin/assets/graniteblock.jp2 b/bin/assets/OpenSimAssetSet/graniteblock.jp2
index c7c03f9..c7c03f9 100644
--- a/bin/assets/graniteblock.jp2
+++ b/bin/assets/OpenSimAssetSet/graniteblock.jp2
diff --git a/bin/assets/grass.jp2 b/bin/assets/OpenSimAssetSet/grass.jp2
index 63cdfa3..63cdfa3 100644
--- a/bin/assets/grass.jp2
+++ b/bin/assets/OpenSimAssetSet/grass.jp2
diff --git a/bin/assets/grass2.jp2 b/bin/assets/OpenSimAssetSet/grass2.jp2
index 74eb2b4..74eb2b4 100644
--- a/bin/assets/grass2.jp2
+++ b/bin/assets/OpenSimAssetSet/grass2.jp2
diff --git a/bin/assets/gravel.jp2 b/bin/assets/OpenSimAssetSet/gravel.jp2
index 21ed22e..21ed22e 100644
--- a/bin/assets/gravel.jp2
+++ b/bin/assets/OpenSimAssetSet/gravel.jp2
diff --git a/bin/assets/greybrick.jp2 b/bin/assets/OpenSimAssetSet/greybrick.jp2
index 5f45363..5f45363 100644
--- a/bin/assets/greybrick.jp2
+++ b/bin/assets/OpenSimAssetSet/greybrick.jp2
diff --git a/bin/assets/hardwood.jp2 b/bin/assets/OpenSimAssetSet/hardwood.jp2
index ff0fcce..ff0fcce 100644
--- a/bin/assets/hardwood.jp2
+++ b/bin/assets/OpenSimAssetSet/hardwood.jp2
diff --git a/bin/assets/ivy.jp2 b/bin/assets/OpenSimAssetSet/ivy.jp2
index d19d18d..d19d18d 100644
--- a/bin/assets/ivy.jp2
+++ b/bin/assets/OpenSimAssetSet/ivy.jp2
diff --git a/bin/assets/jim_shape.dat b/bin/assets/OpenSimAssetSet/jim_shape.dat
index 733fc8c..733fc8c 100644
--- a/bin/assets/jim_shape.dat
+++ b/bin/assets/OpenSimAssetSet/jim_shape.dat
diff --git a/bin/assets/jim_skin.dat b/bin/assets/OpenSimAssetSet/jim_skin.dat
index 7d409c9..7d409c9 100644
--- a/bin/assets/jim_skin.dat
+++ b/bin/assets/OpenSimAssetSet/jim_skin.dat
diff --git a/bin/assets/licenses.txt b/bin/assets/OpenSimAssetSet/licenses.txt
index 5d34424..5d34424 100644
--- a/bin/assets/licenses.txt
+++ b/bin/assets/OpenSimAssetSet/licenses.txt
diff --git a/bin/assets/little_goblin_shape.dat b/bin/assets/OpenSimAssetSet/little_goblin_shape.dat
index 752fb55..752fb55 100644
--- a/bin/assets/little_goblin_shape.dat
+++ b/bin/assets/OpenSimAssetSet/little_goblin_shape.dat
diff --git a/bin/assets/mahogany.jp2 b/bin/assets/OpenSimAssetSet/mahogany.jp2
index faca335..faca335 100644
--- a/bin/assets/mahogany.jp2
+++ b/bin/assets/OpenSimAssetSet/mahogany.jp2
diff --git a/bin/assets/map1.jp2 b/bin/assets/OpenSimAssetSet/map1.jp2
index cd2fd94..cd2fd94 100644
--- a/bin/assets/map1.jp2
+++ b/bin/assets/OpenSimAssetSet/map1.jp2
diff --git a/bin/assets/map_base.jp2 b/bin/assets/OpenSimAssetSet/map_base.jp2
index 5ad1fd0..5ad1fd0 100644
--- a/bin/assets/map_base.jp2
+++ b/bin/assets/OpenSimAssetSet/map_base.jp2
diff --git a/bin/assets/maple.jp2 b/bin/assets/OpenSimAssetSet/maple.jp2
index 1601336..1601336 100644
--- a/bin/assets/maple.jp2
+++ b/bin/assets/OpenSimAssetSet/maple.jp2
diff --git a/bin/assets/moon.jp2 b/bin/assets/OpenSimAssetSet/moon.jp2
index 235ea5f..235ea5f 100644
--- a/bin/assets/moon.jp2
+++ b/bin/assets/OpenSimAssetSet/moon.jp2
diff --git a/bin/assets/mosaic02.jp2 b/bin/assets/OpenSimAssetSet/mosaic02.jp2
index 1f853e9..1f853e9 100644
--- a/bin/assets/mosaic02.jp2
+++ b/bin/assets/OpenSimAssetSet/mosaic02.jp2
diff --git a/bin/assets/newhair.dat b/bin/assets/OpenSimAssetSet/newhair.dat
index 3c5a8c9..3c5a8c9 100644
--- a/bin/assets/newhair.dat
+++ b/bin/assets/OpenSimAssetSet/newhair.dat
diff --git a/bin/assets/newpants.dat b/bin/assets/OpenSimAssetSet/newpants.dat
index 96be614..96be614 100644
--- a/bin/assets/newpants.dat
+++ b/bin/assets/OpenSimAssetSet/newpants.dat
diff --git a/bin/assets/newshirt.dat b/bin/assets/OpenSimAssetSet/newshirt.dat
index bce62bc..bce62bc 100644
--- a/bin/assets/newshirt.dat
+++ b/bin/assets/OpenSimAssetSet/newshirt.dat
diff --git a/bin/assets/palm1.jp2 b/bin/assets/OpenSimAssetSet/palm1.jp2
index ddc3be4..ddc3be4 100644
--- a/bin/assets/palm1.jp2
+++ b/bin/assets/OpenSimAssetSet/palm1.jp2
diff --git a/bin/assets/papaya.jp2 b/bin/assets/OpenSimAssetSet/papaya.jp2
index 53d037e..53d037e 100644
--- a/bin/assets/papaya.jp2
+++ b/bin/assets/OpenSimAssetSet/papaya.jp2
diff --git a/bin/assets/papaya_bark.jp2 b/bin/assets/OpenSimAssetSet/papaya_bark.jp2
index 37642ce..37642ce 100644
--- a/bin/assets/papaya_bark.jp2
+++ b/bin/assets/OpenSimAssetSet/papaya_bark.jp2
diff --git a/bin/assets/pastelbrick.jp2 b/bin/assets/OpenSimAssetSet/pastelbrick.jp2
index 5d21456..5d21456 100644
--- a/bin/assets/pastelbrick.jp2
+++ b/bin/assets/OpenSimAssetSet/pastelbrick.jp2
diff --git a/bin/assets/peaches.jp2 b/bin/assets/OpenSimAssetSet/peaches.jp2
index a3ec8f0..a3ec8f0 100644
--- a/bin/assets/peaches.jp2
+++ b/bin/assets/OpenSimAssetSet/peaches.jp2
diff --git a/bin/assets/pine1_10m.jp2 b/bin/assets/OpenSimAssetSet/pine1_10m.jp2
index 376e9ee..376e9ee 100644
--- a/bin/assets/pine1_10m.jp2
+++ b/bin/assets/OpenSimAssetSet/pine1_10m.jp2
diff --git a/bin/assets/plywood.jp2 b/bin/assets/OpenSimAssetSet/plywood.jp2
index 2053675..2053675 100644
--- a/bin/assets/plywood.jp2
+++ b/bin/assets/OpenSimAssetSet/plywood.jp2
diff --git a/bin/assets/poplar.jp2 b/bin/assets/OpenSimAssetSet/poplar.jp2
index f879078..f879078 100644
--- a/bin/assets/poplar.jp2
+++ b/bin/assets/OpenSimAssetSet/poplar.jp2
diff --git a/bin/assets/redtri_tile.jp2 b/bin/assets/OpenSimAssetSet/redtri_tile.jp2
index 5fca48f..5fca48f 100644
--- a/bin/assets/redtri_tile.jp2
+++ b/bin/assets/OpenSimAssetSet/redtri_tile.jp2
diff --git a/bin/assets/rockbuilding.jp2 b/bin/assets/OpenSimAssetSet/rockbuilding.jp2
index 463f7e3..463f7e3 100644
--- a/bin/assets/rockbuilding.jp2
+++ b/bin/assets/OpenSimAssetSet/rockbuilding.jp2
diff --git a/bin/assets/rocks.jp2 b/bin/assets/OpenSimAssetSet/rocks.jp2
index 6113881..6113881 100644
--- a/bin/assets/rocks.jp2
+++ b/bin/assets/OpenSimAssetSet/rocks.jp2
diff --git a/bin/assets/rockwallbig.jp2 b/bin/assets/OpenSimAssetSet/rockwallbig.jp2
index b0f1d42..b0f1d42 100644
--- a/bin/assets/rockwallbig.jp2
+++ b/bin/assets/OpenSimAssetSet/rockwallbig.jp2
diff --git a/bin/assets/roof01.jp2 b/bin/assets/OpenSimAssetSet/roof01.jp2
index c1bbd62..c1bbd62 100644
--- a/bin/assets/roof01.jp2
+++ b/bin/assets/OpenSimAssetSet/roof01.jp2
diff --git a/bin/assets/rooftiles1.jp2 b/bin/assets/OpenSimAssetSet/rooftiles1.jp2
index 5a1750b..5a1750b 100644
--- a/bin/assets/rooftiles1.jp2
+++ b/bin/assets/OpenSimAssetSet/rooftiles1.jp2
diff --git a/bin/assets/rooftiles2_peach.jp2 b/bin/assets/OpenSimAssetSet/rooftiles2_peach.jp2
index aae5daf..aae5daf 100644
--- a/bin/assets/rooftiles2_peach.jp2
+++ b/bin/assets/OpenSimAssetSet/rooftiles2_peach.jp2
diff --git a/bin/assets/rooftiles2_roy.jp2 b/bin/assets/OpenSimAssetSet/rooftiles2_roy.jp2
index ea2c840..ea2c840 100644
--- a/bin/assets/rooftiles2_roy.jp2
+++ b/bin/assets/OpenSimAssetSet/rooftiles2_roy.jp2
diff --git a/bin/assets/saguaro_8m.jp2 b/bin/assets/OpenSimAssetSet/saguaro_8m.jp2
index 9c577b4..9c577b4 100644
--- a/bin/assets/saguaro_8m.jp2
+++ b/bin/assets/OpenSimAssetSet/saguaro_8m.jp2
diff --git a/bin/assets/seawater.jp2 b/bin/assets/OpenSimAssetSet/seawater.jp2
index 850371c..850371c 100644
--- a/bin/assets/seawater.jp2
+++ b/bin/assets/OpenSimAssetSet/seawater.jp2
diff --git a/bin/assets/shingle.jp2 b/bin/assets/OpenSimAssetSet/shingle.jp2
index abbb496..abbb496 100644
--- a/bin/assets/shingle.jp2
+++ b/bin/assets/OpenSimAssetSet/shingle.jp2
diff --git a/bin/assets/snow1.jp2 b/bin/assets/OpenSimAssetSet/snow1.jp2
index a83b349..a83b349 100644
--- a/bin/assets/snow1.jp2
+++ b/bin/assets/OpenSimAssetSet/snow1.jp2
diff --git a/bin/assets/steel.jp2 b/bin/assets/OpenSimAssetSet/steel.jp2
index 4da19a0..4da19a0 100644
--- a/bin/assets/steel.jp2
+++ b/bin/assets/OpenSimAssetSet/steel.jp2
diff --git a/bin/assets/stone1wall.jp2 b/bin/assets/OpenSimAssetSet/stone1wall.jp2
index d4db404..d4db404 100644
--- a/bin/assets/stone1wall.jp2
+++ b/bin/assets/OpenSimAssetSet/stone1wall.jp2
diff --git a/bin/assets/stonetile.jp2 b/bin/assets/OpenSimAssetSet/stonetile.jp2
index 36d8c71..36d8c71 100644
--- a/bin/assets/stonetile.jp2
+++ b/bin/assets/OpenSimAssetSet/stonetile.jp2
diff --git a/bin/assets/street2.jp2 b/bin/assets/OpenSimAssetSet/street2.jp2
index fd8ffdf..fd8ffdf 100644
--- a/bin/assets/street2.jp2
+++ b/bin/assets/OpenSimAssetSet/street2.jp2
diff --git a/bin/assets/testpic2.jp2 b/bin/assets/OpenSimAssetSet/testpic2.jp2
index e6840e2..e6840e2 100644
--- a/bin/assets/testpic2.jp2
+++ b/bin/assets/OpenSimAssetSet/testpic2.jp2
diff --git a/bin/assets/thatch.jp2 b/bin/assets/OpenSimAssetSet/thatch.jp2
index c6b7e40..c6b7e40 100644
--- a/bin/assets/thatch.jp2
+++ b/bin/assets/OpenSimAssetSet/thatch.jp2
diff --git a/bin/assets/water1.jp2 b/bin/assets/OpenSimAssetSet/water1.jp2
index e714d4c..e714d4c 100644
--- a/bin/assets/water1.jp2
+++ b/bin/assets/OpenSimAssetSet/water1.jp2
diff --git a/bin/assets/water3.jp2 b/bin/assets/OpenSimAssetSet/water3.jp2
index be2984b..be2984b 100644
--- a/bin/assets/water3.jp2
+++ b/bin/assets/OpenSimAssetSet/water3.jp2
diff --git a/bin/assets/welcomeNote.dat b/bin/assets/OpenSimAssetSet/welcomeNote.dat
index c232ce1..c232ce1 100644
--- a/bin/assets/welcomeNote.dat
+++ b/bin/assets/OpenSimAssetSet/welcomeNote.dat
diff --git a/bin/assets/wood1.jp2 b/bin/assets/OpenSimAssetSet/wood1.jp2
index 3758326..3758326 100644
--- a/bin/assets/wood1.jp2
+++ b/bin/assets/OpenSimAssetSet/wood1.jp2