aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs10
2 files changed, 8 insertions, 3 deletions
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
342 m_log.Error( 342 m_log.Error(
343 "[VECTORRENDERMODULE]: OpenJpeg Encode Failed. Empty byte data returned!"); 343 "[VECTORRENDERMODULE]: OpenJpeg Encode Failed. Empty byte data returned!");
344 } 344 }
345
345 m_textureManager.ReturnData(id, imageJ2000); 346 m_textureManager.ReturnData(id, imageJ2000);
346 } 347 }
347 348
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 8d84557..dd797fc 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4144,9 +4144,13 @@ namespace OpenSim.Region.Framework.Scenes
4144 ScheduleFullUpdate(); 4144 ScheduleFullUpdate();
4145 } 4145 }
4146 4146
4147 // Added to handle bug in libsecondlife's TextureEntry.ToBytes() 4147 /// <summary>
4148 // not handling RGBA properly. Cycles through, and "fixes" the color 4148 /// Update the textures on the part.
4149 // info 4149 /// </summary>
4150 /// Added to handle bug in libsecondlife's TextureEntry.ToBytes()
4151 /// not handling RGBA properly. Cycles through, and "fixes" the color
4152 /// info
4153 /// <param name="tex"></param>
4150 public void UpdateTexture(Primitive.TextureEntry tex) 4154 public void UpdateTexture(Primitive.TextureEntry tex)
4151 { 4155 {
4152 //Color4 tmpcolor; 4156 //Color4 tmpcolor;