diff options
author | Justin Clarke Casey | 2007-12-28 22:49:32 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2007-12-28 22:49:32 +0000 |
commit | 505067658afe80fb3e8da1b44c73f993091ded10 (patch) | |
tree | fffdfc20d526ffc082d74ae22146f7b46b206b8a | |
parent | Move OpenSimAssetSet assets file up into assets pending further changes (diff) | |
download | opensim-SC_OLD-505067658afe80fb3e8da1b44c73f993091ded10.zip opensim-SC_OLD-505067658afe80fb3e8da1b44c73f993091ded10.tar.gz opensim-SC_OLD-505067658afe80fb3e8da1b44c73f993091ded10.tar.bz2 opensim-SC_OLD-505067658afe80fb3e8da1b44c73f993091ded10.tar.xz |
Migrate opensim default assets up another directory in preparation for extraction of hardcoded asset locations into xml
-rw-r--r-- | OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs | 4 | ||||
-rw-r--r-- | bin/assets/OpenSimAssetSet/4-tile2.jp2 (renamed from bin/assets/4-tile2.jp2) | bin | 24410 -> 24410 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/4-tile3.jp2 (renamed from bin/assets/4-tile3.jp2) | bin | 98273 -> 98273 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/OpenSimAssetSet.xml (renamed from bin/assets/OpenSimAssetSet.xml) | 0 | ||||
-rw-r--r-- | bin/assets/OpenSimAssetSet/base_shape.dat (renamed from bin/assets/base_shape.dat) | 0 | ||||
-rw-r--r-- | bin/assets/OpenSimAssetSet/base_skin.dat (renamed from bin/assets/base_skin.dat) | 0 | ||||
-rw-r--r-- | bin/assets/OpenSimAssetSet/brick1_256.jp2 (renamed from bin/assets/brick1_256.jp2) | bin | 24468 -> 24468 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/brick2_256.jp2 (renamed from bin/assets/brick2_256.jp2) | bin | 24455 -> 24455 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/brick_mono.jp2 (renamed from bin/assets/brick_mono.jp2) | bin | 23102 -> 23102 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/bricks.jp2 (renamed from bin/assets/bricks.jp2) | 0 | ||||
-rw-r--r-- | bin/assets/OpenSimAssetSet/cedar.jp2 (renamed from bin/assets/cedar.jp2) | bin | 76710 -> 76710 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/cement_block.jp2 (renamed from bin/assets/cement_block.jp2) | bin | 24538 -> 24538 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/clear.jp2 (renamed from bin/assets/clear.jp2) | bin | 330 -> 330 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/cloud.jp2 (renamed from bin/assets/cloud.jp2) | bin | 23852 -> 23852 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/cobbles.jp2 (renamed from bin/assets/cobbles.jp2) | bin | 98294 -> 98294 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/coffee.jp2 (renamed from bin/assets/coffee.jp2) | bin | 32756 -> 32756 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/creambrick.jp2 (renamed from bin/assets/creambrick.jp2) | bin | 98132 -> 98132 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/femalebody.jp2 (renamed from bin/assets/femalebody.jp2) | bin | 56124 -> 56124 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/femalebottom.jp2 (renamed from bin/assets/femalebottom.jp2) | bin | 54574 -> 54574 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/femaleface.jp2 (renamed from bin/assets/femaleface.jp2) | bin | 76425 -> 76425 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/fgrass.jp2 (renamed from bin/assets/fgrass.jp2) | bin | 32597 -> 32597 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/glasstile2.jp2 (renamed from bin/assets/glasstile2.jp2) | bin | 393170 -> 393170 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/goblin_skin.dat (renamed from bin/assets/goblin_skin.dat) | 0 | ||||
-rw-r--r-- | bin/assets/OpenSimAssetSet/granite.jp2 (renamed from bin/assets/granite.jp2) | 0 | ||||
-rw-r--r-- | bin/assets/OpenSimAssetSet/graniteblock.jp2 (renamed from bin/assets/graniteblock.jp2) | bin | 98271 -> 98271 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/grass.jp2 (renamed from bin/assets/grass.jp2) | bin | 393153 -> 393153 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/grass2.jp2 (renamed from bin/assets/grass2.jp2) | bin | 98241 -> 98241 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/gravel.jp2 (renamed from bin/assets/gravel.jp2) | bin | 392995 -> 392995 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/greybrick.jp2 (renamed from bin/assets/greybrick.jp2) | bin | 393124 -> 393124 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/hardwood.jp2 (renamed from bin/assets/hardwood.jp2) | bin | 98231 -> 98231 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/ivy.jp2 (renamed from bin/assets/ivy.jp2) | bin | 393100 -> 393100 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/jim_shape.dat (renamed from bin/assets/jim_shape.dat) | 0 | ||||
-rw-r--r-- | bin/assets/OpenSimAssetSet/jim_skin.dat (renamed from bin/assets/jim_skin.dat) | 0 | ||||
-rw-r--r-- | bin/assets/OpenSimAssetSet/licenses.txt (renamed from bin/assets/licenses.txt) | 0 | ||||
-rw-r--r-- | bin/assets/OpenSimAssetSet/little_goblin_shape.dat (renamed from bin/assets/little_goblin_shape.dat) | 0 | ||||
-rw-r--r-- | bin/assets/OpenSimAssetSet/mahogany.jp2 (renamed from bin/assets/mahogany.jp2) | bin | 98250 -> 98250 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/map1.jp2 (renamed from bin/assets/map1.jp2) | bin | 570 -> 570 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/map_base.jp2 (renamed from bin/assets/map_base.jp2) | bin | 153 -> 153 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/maple.jp2 (renamed from bin/assets/maple.jp2) | bin | 98125 -> 98125 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/moon.jp2 (renamed from bin/assets/moon.jp2) | bin | 32741 -> 32741 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/mosaic02.jp2 (renamed from bin/assets/mosaic02.jp2) | bin | 98286 -> 98286 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/newhair.dat (renamed from bin/assets/newhair.dat) | 0 | ||||
-rw-r--r-- | bin/assets/OpenSimAssetSet/newpants.dat (renamed from bin/assets/newpants.dat) | 0 | ||||
-rw-r--r-- | bin/assets/OpenSimAssetSet/newshirt.dat (renamed from bin/assets/newshirt.dat) | 0 | ||||
-rw-r--r-- | bin/assets/OpenSimAssetSet/palm1.jp2 (renamed from bin/assets/palm1.jp2) | bin | 65526 -> 65526 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/papaya.jp2 (renamed from bin/assets/papaya.jp2) | bin | 65387 -> 65387 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/papaya_bark.jp2 (renamed from bin/assets/papaya_bark.jp2) | bin | 12254 -> 12254 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/pastelbrick.jp2 (renamed from bin/assets/pastelbrick.jp2) | bin | 196352 -> 196352 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/peaches.jp2 (renamed from bin/assets/peaches.jp2) | bin | 98845 -> 98845 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/pine1_10m.jp2 (renamed from bin/assets/pine1_10m.jp2) | bin | 65485 -> 65485 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/plywood.jp2 (renamed from bin/assets/plywood.jp2) | bin | 79234 -> 79234 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/poplar.jp2 (renamed from bin/assets/poplar.jp2) | bin | 16375 -> 16375 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/redtri_tile.jp2 (renamed from bin/assets/redtri_tile.jp2) | bin | 98187 -> 98187 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/rockbuilding.jp2 (renamed from bin/assets/rockbuilding.jp2) | bin | 24251 -> 24251 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/rocks.jp2 (renamed from bin/assets/rocks.jp2) | 0 | ||||
-rw-r--r-- | bin/assets/OpenSimAssetSet/rockwallbig.jp2 (renamed from bin/assets/rockwallbig.jp2) | bin | 98223 -> 98223 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/roof01.jp2 (renamed from bin/assets/roof01.jp2) | bin | 24310 -> 24310 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/rooftiles1.jp2 (renamed from bin/assets/rooftiles1.jp2) | bin | 6121 -> 6121 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/rooftiles2_peach.jp2 (renamed from bin/assets/rooftiles2_peach.jp2) | bin | 24548 -> 24548 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/rooftiles2_roy.jp2 (renamed from bin/assets/rooftiles2_roy.jp2) | bin | 24444 -> 24444 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/saguaro_8m.jp2 (renamed from bin/assets/saguaro_8m.jp2) | bin | 63056 -> 63056 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/seawater.jp2 (renamed from bin/assets/seawater.jp2) | bin | 98285 -> 98285 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/shingle.jp2 (renamed from bin/assets/shingle.jp2) | bin | 24560 -> 24560 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/snow1.jp2 (renamed from bin/assets/snow1.jp2) | bin | 97993 -> 97993 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/steel.jp2 (renamed from bin/assets/steel.jp2) | bin | 98186 -> 98186 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/stone1wall.jp2 (renamed from bin/assets/stone1wall.jp2) | bin | 98251 -> 98251 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/stonetile.jp2 (renamed from bin/assets/stonetile.jp2) | bin | 393159 -> 393159 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/street2.jp2 (renamed from bin/assets/street2.jp2) | bin | 196334 -> 196334 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/testpic2.jp2 (renamed from bin/assets/testpic2.jp2) | bin | 291 -> 291 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/thatch.jp2 (renamed from bin/assets/thatch.jp2) | bin | 98178 -> 98178 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/water1.jp2 (renamed from bin/assets/water1.jp2) | bin | 98298 -> 98298 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/water3.jp2 (renamed from bin/assets/water3.jp2) | bin | 98190 -> 98190 bytes | |||
-rw-r--r-- | bin/assets/OpenSimAssetSet/welcomeNote.dat (renamed from bin/assets/welcomeNote.dat) | 0 | ||||
-rw-r--r-- | bin/assets/OpenSimAssetSet/wood1.jp2 (renamed from bin/assets/wood1.jp2) | bin | 24522 -> 24522 bytes |
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 | |||
67 | 67 | ||
68 | protected void LoadAsset(AssetBase info, bool image, string filename) | 68 | protected void LoadAsset(AssetBase info, bool image, string filename) |
69 | { | 69 | { |
70 | string dataPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets"); //+ folder; | 70 | string dataPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets/OpenSimAssetSet"); //+ folder; |
71 | string fileName = Path.Combine(dataPath, filename); | 71 | string fileName = Path.Combine(dataPath, filename); |
72 | FileInfo fInfo = new FileInfo(fileName); | 72 | FileInfo fInfo = new FileInfo(fileName); |
73 | long numBytes = fInfo.Length; | 73 | long numBytes = fInfo.Length; |
@@ -85,7 +85,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem | |||
85 | { | 85 | { |
86 | List<AssetBase> assets = new List<AssetBase>(); | 86 | List<AssetBase> assets = new List<AssetBase>(); |
87 | // System.Console.WriteLine("trying loading asset into database"); | 87 | // System.Console.WriteLine("trying loading asset into database"); |
88 | string filePath = Path.Combine(Util.configDir(), "assets/OpenSimAssetSet.xml"); | 88 | string filePath = Path.Combine(Util.configDir(), "assets/OpenSimAssetSet/OpenSimAssetSet.xml"); |
89 | if (File.Exists(filePath)) | 89 | if (File.Exists(filePath)) |
90 | { | 90 | { |
91 | try | 91 | 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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||
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 | |||
Binary files differ | |||