aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index 665d7f7..c369d87 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -181,12 +181,12 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
181 string extraParams, int updateTimer, bool SetBlending, byte AlphaValue) 181 string extraParams, int updateTimer, bool SetBlending, byte AlphaValue)
182 { 182 {
183 return AddDynamicTextureURL(simID, primID, contentType, url, 183 return AddDynamicTextureURL(simID, primID, contentType, url,
184 extraParams, updateTimer, SetBlending, 184 extraParams, updateTimer, SetBlending,
185 (int)(DISP_TEMP|DISP_EXPIRE), AlphaValue, ALL_SIDES); 185 (int)(DISP_TEMP|DISP_EXPIRE), AlphaValue, ALL_SIDES);
186 } 186 }
187 187
188 public UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url, 188 public UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url,
189 string extraParams, int updateTimer, bool SetBlending, 189 string extraParams, int updateTimer, bool SetBlending,
190 int disp, byte AlphaValue, int face) 190 int disp, byte AlphaValue, int face)
191 { 191 {
192 if (RenderPlugins.ContainsKey(contentType)) 192 if (RenderPlugins.ContainsKey(contentType))
@@ -227,7 +227,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
227 public UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data, 227 public UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data,
228 string extraParams, int updateTimer, bool SetBlending, byte AlphaValue) 228 string extraParams, int updateTimer, bool SetBlending, byte AlphaValue)
229 { 229 {
230 return AddDynamicTextureData(simID, primID, contentType, data, extraParams, updateTimer, SetBlending, 230 return AddDynamicTextureData(simID, primID, contentType, data, extraParams, updateTimer, SetBlending,
231 (int) (DISP_TEMP|DISP_EXPIRE), AlphaValue, ALL_SIDES); 231 (int) (DISP_TEMP|DISP_EXPIRE), AlphaValue, ALL_SIDES);
232 } 232 }
233 233
@@ -478,17 +478,17 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
478 478
479 if (part == null || data == null || data.Length <= 1) 479 if (part == null || data == null || data.Length <= 1)
480 { 480 {
481 string msg = 481 string msg =
482 String.Format("DynamicTextureModule: Error preparing image using URL {0}", Url); 482 String.Format("DynamicTextureModule: Error preparing image using URL {0}", Url);
483 scene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Say, 483 scene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Say,
484 0, part.ParentGroup.RootPart.AbsolutePosition, part.Name, part.UUID, false); 484 0, part.ParentGroup.RootPart.AbsolutePosition, part.Name, part.UUID, false);
485 485
486 return UUID.Zero; 486 return UUID.Zero;
487 } 487 }
488 488
489 byte[] assetData = null; 489 byte[] assetData = null;
490 AssetBase oldAsset = null; 490 AssetBase oldAsset = null;
491 491
492 if (BlendWithOldTexture) 492 if (BlendWithOldTexture)
493 { 493 {
494 Primitive.TextureEntryFace defaultFace = part.Shape.Textures.DefaultTexture; 494 Primitive.TextureEntryFace defaultFace = part.Shape.Textures.DefaultTexture;
@@ -558,7 +558,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
558 558
559 Bitmap image1 = new Bitmap(image); 559 Bitmap image1 = new Bitmap(image);
560 image.Dispose(); 560 image.Dispose();
561 561
562 if (!OpenJPEG.DecodeToImage(backImage, out managedImage, out image) || image == null) 562 if (!OpenJPEG.DecodeToImage(backImage, out managedImage, out image) || image == null)
563 { 563 {
564 image1.Dispose(); 564 image1.Dispose();