From f1b99c4a7f9543c3a2aa36de2e659bdefca9e68b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 4 Feb 2010 21:35:56 +0000
Subject: minor: one method doc

---
 OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index d57a8e5..3291be4 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -342,6 +342,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
                 m_log.Error(
                     "[VECTORRENDERMODULE]: OpenJpeg Encode Failed.  Empty byte data returned!");
             }
+
             m_textureManager.ReturnData(id, imageJ2000);
         }
         
-- 
cgit v1.1


From 7058a4c2597a2b76704e906b73ae7077ff805b16 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 5 Feb 2010 18:09:27 +0000
Subject: Old OpenSim installations may have no AssetCaching setting in
 config-include/StandaloneCommon.ini [Modules] (or no [Modules] at all) If
 this is the case, this patch makes CenomeAssetCache the default cache (which
 matches that selected in StandaloneCommon.ini.example) Not having an asset
 cache may lead to a continual loop of appearance baking failures and cause
 dynamic textures not to work, among other effects

---
 OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
index 1add0ab..e0e4cc6 100644
--- a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
@@ -324,7 +324,9 @@ namespace OpenSim.Region.CoreModules.Asset
             if (moduleConfig == null)
                 return;
 
-            string name = moduleConfig.GetString("AssetCaching");
+            // We're going to make CenomeAssetCache the default if there is no AssetCaching setting at all.  This
+            // matches the default StandaloneCommon.ini.example
+            string name = moduleConfig.GetString("AssetCaching", Name);
             //Log.DebugFormat("[XXX] name = {0} (this module's name: {1}", name, Name);
 
             if (name != Name)
-- 
cgit v1.1


From 68bb2dac45d7ce0d280cdfa66de3d142bb05c8cc Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 5 Feb 2010 19:21:27 +0000
Subject: Revert "Old OpenSim installations may have no AssetCaching setting in
 config-include/StandaloneCommon.ini [Modules] (or no [Modules] at all)"

This will be replaced by a better solution where an enabled baking module will fail if no cache is in place (same for dynamic texture modules)

This reverts commit 7058a4c2597a2b76704e906b73ae7077ff805b16.
---
 OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
index e0e4cc6..1add0ab 100644
--- a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs
@@ -324,9 +324,7 @@ namespace OpenSim.Region.CoreModules.Asset
             if (moduleConfig == null)
                 return;
 
-            // We're going to make CenomeAssetCache the default if there is no AssetCaching setting at all.  This
-            // matches the default StandaloneCommon.ini.example
-            string name = moduleConfig.GetString("AssetCaching", Name);
+            string name = moduleConfig.GetString("AssetCaching");
             //Log.DebugFormat("[XXX] name = {0} (this module's name: {1}", name, Name);
 
             if (name != Name)
-- 
cgit v1.1