From 22cc31135e2989df28e0756eb3b03f85530d5555 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Tue, 29 Sep 2009 18:15:22 -0700
Subject: Attempting to improve the robustness of texture decoding by always
ignoring LayerInfo.End values and creating guessed default layer boundaries
on failed decodes Changed a noisy J2K decode log message from Info to Debug
Replacing openjpeg-dotnet decoding with managed CSJ2K decoding. Should be much more reliable, faster, and use less memory
* Re-added openjpeg-dotnet files since they are used elsewhere in OpenSim * Updated prebuild.xml with a reference to CSJ2K
---
bin/CSJ2K.dll | Bin 0 -> 544768 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 bin/CSJ2K.dll
(limited to 'bin')
diff --git a/bin/CSJ2K.dll b/bin/CSJ2K.dll
new file mode 100644
index 0000000..ff7e809
Binary files /dev/null and b/bin/CSJ2K.dll differ
--
cgit v1.1
From f908e32f620272a63c6a338fddfa3214ce95627b Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 30 Sep 2009 19:26:26 +0100
Subject: Revert "Attempting to improve the robustness of texture decoding by
always ignoring LayerInfo.End values and creating guessed default layer
boundaries on failed decodes Changed a noisy J2K decode log message from Info
to Debug"
This reverts commit 22cc31135e2989df28e0756eb3b03f85530d5555.
---
bin/CSJ2K.dll | Bin 544768 -> 0 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 bin/CSJ2K.dll
(limited to 'bin')
diff --git a/bin/CSJ2K.dll b/bin/CSJ2K.dll
deleted file mode 100644
index ff7e809..0000000
Binary files a/bin/CSJ2K.dll and /dev/null differ
--
cgit v1.1
From f56dc5fcda16d96a309120b2a75a623cf455a8e8 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Wed, 30 Sep 2009 12:18:22 -0700
Subject: Attempting to improve the robustness of texture decoding by always
ignoring LayerInfo.End values and creating guessed default layer boundaries
on failed decodes Changed a noisy J2K decode log message from Info to Debug
Replacing openjpeg-dotnet decoding with managed CSJ2K decoding. Should be
much more reliable, faster, and use less memory
* Re-added openjpeg-dotnet files since they are used elsewhere in OpenSim * Updated prebuild.xml with a reference to CSJ2K
* Renamed IJ2KDecoder and J2KDecoder member names to follow standard naming conventions * Removed j2kDecodeCache cruft and replaced it with the OpenSim cache system * Rewrote the default layer boundary algorithm to use percentages instead of an exponent * Switched from an infinite in-memory cache to an expiring cache (10 minute timeout) * Slightly quieted logging errors for failed texture decodes
---
bin/CSJ2K.dll | Bin 0 -> 544768 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 bin/CSJ2K.dll
(limited to 'bin')
diff --git a/bin/CSJ2K.dll b/bin/CSJ2K.dll
new file mode 100644
index 0000000..ff7e809
Binary files /dev/null and b/bin/CSJ2K.dll differ
--
cgit v1.1
From d0bf084da5bad6f7e07e78c6ad5758860c44be21 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 30 Sep 2009 20:34:42 +0100
Subject: Remove the settings for the J2KDecoder, since they are now obsolete
(thank god!)
---
bin/OpenSim.ini.example | 9 ---------
1 file changed, 9 deletions(-)
(limited to 'bin')
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index d38c511..2be8c06 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1369,15 +1369,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
--
cgit v1.1
From 6e0c79b8fe76c7d2c983cb7b258a75a3300e78f2 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Thu, 1 Oct 2009 17:42:13 -0700
Subject: * Rewrote LLImageManager to use a real priority queue and hold
minimal state * Rewrote the logic in J2KImage.RunUpdate() * Added a default
avatar texture (I made it myself)
---
bin/assets/TexturesAssetSet/TexturesAssetSet.xml | 7 +++++++
bin/assets/TexturesAssetSet/default_avatar.jp2 | Bin 0 -> 36044 bytes
2 files changed, 7 insertions(+)
create mode 100644 bin/assets/TexturesAssetSet/default_avatar.jp2
(limited to 'bin')
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 @@
+
+
diff --git a/bin/assets/TexturesAssetSet/default_avatar.jp2 b/bin/assets/TexturesAssetSet/default_avatar.jp2
new file mode 100644
index 0000000..116b860
Binary files /dev/null and b/bin/assets/TexturesAssetSet/default_avatar.jp2 differ
--
cgit v1.1
From 18a744cac10c797b67236988a84ab6d13a5543b8 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 2 Oct 2009 04:04:14 +0100
Subject: Change texture sending to be driven by the queue empty event from the
packet queue, rather than a timer
---
bin/OpenSim.ini.example | 5 -----
1 file changed, 5 deletions(-)
(limited to 'bin')
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 2be8c06..1f42ef2 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1352,11 +1352,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
--
cgit v1.1