Merge branch 'master' into vehicles

4 files changed, 7 insertions, 13 deletions

diff --git a/bin/CSJ2K.dll b/bin/CSJ2K.dll
new file mode 100644
index 0000000..ff7e809
--- /dev/null
+++ b/bin/CSJ2K.dll
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 1aae98a..fa8dc9d 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1356,11 +1356,6 @@
 
     ;PacketMTU = 1400
 
-    ; TextureUpdateRate (mS) determines how many times per second
-    ; texture send processing will occur. The default is 100mS.
-    ;
-    ;TextureRequestRate = 100
-
     ; TextureSendLimit determines how many different textures
     ; will be considered on each cycle. Textures are selected
     ; by priority. The old mechanism specified a value of 10 for
@@ -1373,14 +1368,6 @@
     ;
     ;TextureDataLimit = 5
 
-;; The JPEG2000 decode cache
-;; Timeout is in minutes
-
-[J2KDecoder]
-;CacheDir = "./j2kDecodeCache"
-; Time in minutes before cached decodes expire. Set to 0 for no expiration. Default is 720 minutes.
-;CacheTimeout = 720
-
 ;;
 ;; These are defaults that are overwritten below in [Architecture].
 ;; These defaults allow OpenSim to work out of the box with
diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
index 0352c99..773de44 100644
--- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
+++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
@@ -401,4 +401,11 @@
     <Key Name="assetType" Value="0" />
     <Key Name="fileName" Value="default_clear.jp2" />
   </Section>
+  
+  <Section Name="Default Avatar">
+    <Key Name="assetID" Value="c228d1cf-4b5d-4ba8-84f4-899a0796aa97"/>
+    <Key Name="name" Value="Default Avatar"/>
+    <Key Name="assetType" Value="0" />
+    <Key Name="fileName" Value="default_avatar.jp2" />
+  </Section>
 </Nini>
diff --git a/bin/assets/TexturesAssetSet/default_avatar.jp2 b/bin/assets/TexturesAssetSet/default_avatar.jp2
new file mode 100644
index 0000000..116b860
--- /dev/null
+++ b/bin/assets/TexturesAssetSet/default_avatar.jp2