diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs index d15acf3da4..bffced842b 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 assets = new List(); // 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 similarity index 100% rename from bin/assets/4-tile2.jp2 rename to bin/assets/OpenSimAssetSet/4-tile2.jp2 diff --git a/bin/assets/4-tile3.jp2 b/bin/assets/OpenSimAssetSet/4-tile3.jp2 similarity index 100% rename from bin/assets/4-tile3.jp2 rename to bin/assets/OpenSimAssetSet/4-tile3.jp2 diff --git a/bin/assets/OpenSimAssetSet.xml b/bin/assets/OpenSimAssetSet/OpenSimAssetSet.xml similarity index 100% rename from bin/assets/OpenSimAssetSet.xml rename to bin/assets/OpenSimAssetSet/OpenSimAssetSet.xml diff --git a/bin/assets/base_shape.dat b/bin/assets/OpenSimAssetSet/base_shape.dat similarity index 100% rename from bin/assets/base_shape.dat rename to bin/assets/OpenSimAssetSet/base_shape.dat diff --git a/bin/assets/base_skin.dat b/bin/assets/OpenSimAssetSet/base_skin.dat similarity index 100% rename from bin/assets/base_skin.dat rename to bin/assets/OpenSimAssetSet/base_skin.dat diff --git a/bin/assets/brick1_256.jp2 b/bin/assets/OpenSimAssetSet/brick1_256.jp2 similarity index 100% rename from bin/assets/brick1_256.jp2 rename to bin/assets/OpenSimAssetSet/brick1_256.jp2 diff --git a/bin/assets/brick2_256.jp2 b/bin/assets/OpenSimAssetSet/brick2_256.jp2 similarity index 100% rename from bin/assets/brick2_256.jp2 rename to bin/assets/OpenSimAssetSet/brick2_256.jp2 diff --git a/bin/assets/brick_mono.jp2 b/bin/assets/OpenSimAssetSet/brick_mono.jp2 similarity index 100% rename from bin/assets/brick_mono.jp2 rename to bin/assets/OpenSimAssetSet/brick_mono.jp2 diff --git a/bin/assets/bricks.jp2 b/bin/assets/OpenSimAssetSet/bricks.jp2 similarity index 100% rename from bin/assets/bricks.jp2 rename to bin/assets/OpenSimAssetSet/bricks.jp2 diff --git a/bin/assets/cedar.jp2 b/bin/assets/OpenSimAssetSet/cedar.jp2 similarity index 100% rename from bin/assets/cedar.jp2 rename to bin/assets/OpenSimAssetSet/cedar.jp2 diff --git a/bin/assets/cement_block.jp2 b/bin/assets/OpenSimAssetSet/cement_block.jp2 similarity index 100% rename from bin/assets/cement_block.jp2 rename to bin/assets/OpenSimAssetSet/cement_block.jp2 diff --git a/bin/assets/clear.jp2 b/bin/assets/OpenSimAssetSet/clear.jp2 similarity index 100% rename from bin/assets/clear.jp2 rename to bin/assets/OpenSimAssetSet/clear.jp2 diff --git a/bin/assets/cloud.jp2 b/bin/assets/OpenSimAssetSet/cloud.jp2 similarity index 100% rename from bin/assets/cloud.jp2 rename to bin/assets/OpenSimAssetSet/cloud.jp2 diff --git a/bin/assets/cobbles.jp2 b/bin/assets/OpenSimAssetSet/cobbles.jp2 similarity index 100% rename from bin/assets/cobbles.jp2 rename to bin/assets/OpenSimAssetSet/cobbles.jp2 diff --git a/bin/assets/coffee.jp2 b/bin/assets/OpenSimAssetSet/coffee.jp2 similarity index 100% rename from bin/assets/coffee.jp2 rename to bin/assets/OpenSimAssetSet/coffee.jp2 diff --git a/bin/assets/creambrick.jp2 b/bin/assets/OpenSimAssetSet/creambrick.jp2 similarity index 100% rename from bin/assets/creambrick.jp2 rename to bin/assets/OpenSimAssetSet/creambrick.jp2 diff --git a/bin/assets/femalebody.jp2 b/bin/assets/OpenSimAssetSet/femalebody.jp2 similarity index 100% rename from bin/assets/femalebody.jp2 rename to bin/assets/OpenSimAssetSet/femalebody.jp2 diff --git a/bin/assets/femalebottom.jp2 b/bin/assets/OpenSimAssetSet/femalebottom.jp2 similarity index 100% rename from bin/assets/femalebottom.jp2 rename to bin/assets/OpenSimAssetSet/femalebottom.jp2 diff --git a/bin/assets/femaleface.jp2 b/bin/assets/OpenSimAssetSet/femaleface.jp2 similarity index 100% rename from bin/assets/femaleface.jp2 rename to bin/assets/OpenSimAssetSet/femaleface.jp2 diff --git a/bin/assets/fgrass.jp2 b/bin/assets/OpenSimAssetSet/fgrass.jp2 similarity index 100% rename from bin/assets/fgrass.jp2 rename to bin/assets/OpenSimAssetSet/fgrass.jp2 diff --git a/bin/assets/glasstile2.jp2 b/bin/assets/OpenSimAssetSet/glasstile2.jp2 similarity index 100% rename from bin/assets/glasstile2.jp2 rename to bin/assets/OpenSimAssetSet/glasstile2.jp2 diff --git a/bin/assets/goblin_skin.dat b/bin/assets/OpenSimAssetSet/goblin_skin.dat similarity index 100% rename from bin/assets/goblin_skin.dat rename to bin/assets/OpenSimAssetSet/goblin_skin.dat diff --git a/bin/assets/granite.jp2 b/bin/assets/OpenSimAssetSet/granite.jp2 similarity index 100% rename from bin/assets/granite.jp2 rename to bin/assets/OpenSimAssetSet/granite.jp2 diff --git a/bin/assets/graniteblock.jp2 b/bin/assets/OpenSimAssetSet/graniteblock.jp2 similarity index 100% rename from bin/assets/graniteblock.jp2 rename to bin/assets/OpenSimAssetSet/graniteblock.jp2 diff --git a/bin/assets/grass.jp2 b/bin/assets/OpenSimAssetSet/grass.jp2 similarity index 100% rename from bin/assets/grass.jp2 rename to bin/assets/OpenSimAssetSet/grass.jp2 diff --git a/bin/assets/grass2.jp2 b/bin/assets/OpenSimAssetSet/grass2.jp2 similarity index 100% rename from bin/assets/grass2.jp2 rename to bin/assets/OpenSimAssetSet/grass2.jp2 diff --git a/bin/assets/gravel.jp2 b/bin/assets/OpenSimAssetSet/gravel.jp2 similarity index 100% rename from bin/assets/gravel.jp2 rename to bin/assets/OpenSimAssetSet/gravel.jp2 diff --git a/bin/assets/greybrick.jp2 b/bin/assets/OpenSimAssetSet/greybrick.jp2 similarity index 100% rename from bin/assets/greybrick.jp2 rename to bin/assets/OpenSimAssetSet/greybrick.jp2 diff --git a/bin/assets/hardwood.jp2 b/bin/assets/OpenSimAssetSet/hardwood.jp2 similarity index 100% rename from bin/assets/hardwood.jp2 rename to bin/assets/OpenSimAssetSet/hardwood.jp2 diff --git a/bin/assets/ivy.jp2 b/bin/assets/OpenSimAssetSet/ivy.jp2 similarity index 100% rename from bin/assets/ivy.jp2 rename to bin/assets/OpenSimAssetSet/ivy.jp2 diff --git a/bin/assets/jim_shape.dat b/bin/assets/OpenSimAssetSet/jim_shape.dat similarity index 100% rename from bin/assets/jim_shape.dat rename to bin/assets/OpenSimAssetSet/jim_shape.dat diff --git a/bin/assets/jim_skin.dat b/bin/assets/OpenSimAssetSet/jim_skin.dat similarity index 100% rename from bin/assets/jim_skin.dat rename to bin/assets/OpenSimAssetSet/jim_skin.dat diff --git a/bin/assets/licenses.txt b/bin/assets/OpenSimAssetSet/licenses.txt similarity index 100% rename from bin/assets/licenses.txt rename to bin/assets/OpenSimAssetSet/licenses.txt diff --git a/bin/assets/little_goblin_shape.dat b/bin/assets/OpenSimAssetSet/little_goblin_shape.dat similarity index 100% rename from bin/assets/little_goblin_shape.dat rename to bin/assets/OpenSimAssetSet/little_goblin_shape.dat diff --git a/bin/assets/mahogany.jp2 b/bin/assets/OpenSimAssetSet/mahogany.jp2 similarity index 100% rename from bin/assets/mahogany.jp2 rename to bin/assets/OpenSimAssetSet/mahogany.jp2 diff --git a/bin/assets/map1.jp2 b/bin/assets/OpenSimAssetSet/map1.jp2 similarity index 100% rename from bin/assets/map1.jp2 rename to bin/assets/OpenSimAssetSet/map1.jp2 diff --git a/bin/assets/map_base.jp2 b/bin/assets/OpenSimAssetSet/map_base.jp2 similarity index 100% rename from bin/assets/map_base.jp2 rename to bin/assets/OpenSimAssetSet/map_base.jp2 diff --git a/bin/assets/maple.jp2 b/bin/assets/OpenSimAssetSet/maple.jp2 similarity index 100% rename from bin/assets/maple.jp2 rename to bin/assets/OpenSimAssetSet/maple.jp2 diff --git a/bin/assets/moon.jp2 b/bin/assets/OpenSimAssetSet/moon.jp2 similarity index 100% rename from bin/assets/moon.jp2 rename to bin/assets/OpenSimAssetSet/moon.jp2 diff --git a/bin/assets/mosaic02.jp2 b/bin/assets/OpenSimAssetSet/mosaic02.jp2 similarity index 100% rename from bin/assets/mosaic02.jp2 rename to bin/assets/OpenSimAssetSet/mosaic02.jp2 diff --git a/bin/assets/newhair.dat b/bin/assets/OpenSimAssetSet/newhair.dat similarity index 100% rename from bin/assets/newhair.dat rename to bin/assets/OpenSimAssetSet/newhair.dat diff --git a/bin/assets/newpants.dat b/bin/assets/OpenSimAssetSet/newpants.dat similarity index 100% rename from bin/assets/newpants.dat rename to bin/assets/OpenSimAssetSet/newpants.dat diff --git a/bin/assets/newshirt.dat b/bin/assets/OpenSimAssetSet/newshirt.dat similarity index 100% rename from bin/assets/newshirt.dat rename to bin/assets/OpenSimAssetSet/newshirt.dat diff --git a/bin/assets/palm1.jp2 b/bin/assets/OpenSimAssetSet/palm1.jp2 similarity index 100% rename from bin/assets/palm1.jp2 rename to bin/assets/OpenSimAssetSet/palm1.jp2 diff --git a/bin/assets/papaya.jp2 b/bin/assets/OpenSimAssetSet/papaya.jp2 similarity index 100% rename from bin/assets/papaya.jp2 rename to bin/assets/OpenSimAssetSet/papaya.jp2 diff --git a/bin/assets/papaya_bark.jp2 b/bin/assets/OpenSimAssetSet/papaya_bark.jp2 similarity index 100% rename from bin/assets/papaya_bark.jp2 rename to bin/assets/OpenSimAssetSet/papaya_bark.jp2 diff --git a/bin/assets/pastelbrick.jp2 b/bin/assets/OpenSimAssetSet/pastelbrick.jp2 similarity index 100% rename from bin/assets/pastelbrick.jp2 rename to bin/assets/OpenSimAssetSet/pastelbrick.jp2 diff --git a/bin/assets/peaches.jp2 b/bin/assets/OpenSimAssetSet/peaches.jp2 similarity index 100% rename from bin/assets/peaches.jp2 rename to bin/assets/OpenSimAssetSet/peaches.jp2 diff --git a/bin/assets/pine1_10m.jp2 b/bin/assets/OpenSimAssetSet/pine1_10m.jp2 similarity index 100% rename from bin/assets/pine1_10m.jp2 rename to bin/assets/OpenSimAssetSet/pine1_10m.jp2 diff --git a/bin/assets/plywood.jp2 b/bin/assets/OpenSimAssetSet/plywood.jp2 similarity index 100% rename from bin/assets/plywood.jp2 rename to bin/assets/OpenSimAssetSet/plywood.jp2 diff --git a/bin/assets/poplar.jp2 b/bin/assets/OpenSimAssetSet/poplar.jp2 similarity index 100% rename from bin/assets/poplar.jp2 rename to bin/assets/OpenSimAssetSet/poplar.jp2 diff --git a/bin/assets/redtri_tile.jp2 b/bin/assets/OpenSimAssetSet/redtri_tile.jp2 similarity index 100% rename from bin/assets/redtri_tile.jp2 rename to bin/assets/OpenSimAssetSet/redtri_tile.jp2 diff --git a/bin/assets/rockbuilding.jp2 b/bin/assets/OpenSimAssetSet/rockbuilding.jp2 similarity index 100% rename from bin/assets/rockbuilding.jp2 rename to bin/assets/OpenSimAssetSet/rockbuilding.jp2 diff --git a/bin/assets/rocks.jp2 b/bin/assets/OpenSimAssetSet/rocks.jp2 similarity index 100% rename from bin/assets/rocks.jp2 rename to bin/assets/OpenSimAssetSet/rocks.jp2 diff --git a/bin/assets/rockwallbig.jp2 b/bin/assets/OpenSimAssetSet/rockwallbig.jp2 similarity index 100% rename from bin/assets/rockwallbig.jp2 rename to bin/assets/OpenSimAssetSet/rockwallbig.jp2 diff --git a/bin/assets/roof01.jp2 b/bin/assets/OpenSimAssetSet/roof01.jp2 similarity index 100% rename from bin/assets/roof01.jp2 rename to bin/assets/OpenSimAssetSet/roof01.jp2 diff --git a/bin/assets/rooftiles1.jp2 b/bin/assets/OpenSimAssetSet/rooftiles1.jp2 similarity index 100% rename from bin/assets/rooftiles1.jp2 rename to bin/assets/OpenSimAssetSet/rooftiles1.jp2 diff --git a/bin/assets/rooftiles2_peach.jp2 b/bin/assets/OpenSimAssetSet/rooftiles2_peach.jp2 similarity index 100% rename from bin/assets/rooftiles2_peach.jp2 rename to bin/assets/OpenSimAssetSet/rooftiles2_peach.jp2 diff --git a/bin/assets/rooftiles2_roy.jp2 b/bin/assets/OpenSimAssetSet/rooftiles2_roy.jp2 similarity index 100% rename from bin/assets/rooftiles2_roy.jp2 rename to bin/assets/OpenSimAssetSet/rooftiles2_roy.jp2 diff --git a/bin/assets/saguaro_8m.jp2 b/bin/assets/OpenSimAssetSet/saguaro_8m.jp2 similarity index 100% rename from bin/assets/saguaro_8m.jp2 rename to bin/assets/OpenSimAssetSet/saguaro_8m.jp2 diff --git a/bin/assets/seawater.jp2 b/bin/assets/OpenSimAssetSet/seawater.jp2 similarity index 100% rename from bin/assets/seawater.jp2 rename to bin/assets/OpenSimAssetSet/seawater.jp2 diff --git a/bin/assets/shingle.jp2 b/bin/assets/OpenSimAssetSet/shingle.jp2 similarity index 100% rename from bin/assets/shingle.jp2 rename to bin/assets/OpenSimAssetSet/shingle.jp2 diff --git a/bin/assets/snow1.jp2 b/bin/assets/OpenSimAssetSet/snow1.jp2 similarity index 100% rename from bin/assets/snow1.jp2 rename to bin/assets/OpenSimAssetSet/snow1.jp2 diff --git a/bin/assets/steel.jp2 b/bin/assets/OpenSimAssetSet/steel.jp2 similarity index 100% rename from bin/assets/steel.jp2 rename to bin/assets/OpenSimAssetSet/steel.jp2 diff --git a/bin/assets/stone1wall.jp2 b/bin/assets/OpenSimAssetSet/stone1wall.jp2 similarity index 100% rename from bin/assets/stone1wall.jp2 rename to bin/assets/OpenSimAssetSet/stone1wall.jp2 diff --git a/bin/assets/stonetile.jp2 b/bin/assets/OpenSimAssetSet/stonetile.jp2 similarity index 100% rename from bin/assets/stonetile.jp2 rename to bin/assets/OpenSimAssetSet/stonetile.jp2 diff --git a/bin/assets/street2.jp2 b/bin/assets/OpenSimAssetSet/street2.jp2 similarity index 100% rename from bin/assets/street2.jp2 rename to bin/assets/OpenSimAssetSet/street2.jp2 diff --git a/bin/assets/testpic2.jp2 b/bin/assets/OpenSimAssetSet/testpic2.jp2 similarity index 100% rename from bin/assets/testpic2.jp2 rename to bin/assets/OpenSimAssetSet/testpic2.jp2 diff --git a/bin/assets/thatch.jp2 b/bin/assets/OpenSimAssetSet/thatch.jp2 similarity index 100% rename from bin/assets/thatch.jp2 rename to bin/assets/OpenSimAssetSet/thatch.jp2 diff --git a/bin/assets/water1.jp2 b/bin/assets/OpenSimAssetSet/water1.jp2 similarity index 100% rename from bin/assets/water1.jp2 rename to bin/assets/OpenSimAssetSet/water1.jp2 diff --git a/bin/assets/water3.jp2 b/bin/assets/OpenSimAssetSet/water3.jp2 similarity index 100% rename from bin/assets/water3.jp2 rename to bin/assets/OpenSimAssetSet/water3.jp2 diff --git a/bin/assets/welcomeNote.dat b/bin/assets/OpenSimAssetSet/welcomeNote.dat similarity index 100% rename from bin/assets/welcomeNote.dat rename to bin/assets/OpenSimAssetSet/welcomeNote.dat diff --git a/bin/assets/wood1.jp2 b/bin/assets/OpenSimAssetSet/wood1.jp2 similarity index 100% rename from bin/assets/wood1.jp2 rename to bin/assets/OpenSimAssetSet/wood1.jp2