From 7305dadba28b0a89873bca6d54e5247233f0a06b Mon Sep 17 00:00:00 2001 From: Charles Krinke Date: Wed, 10 Sep 2008 03:19:57 +0000 Subject: Mantis#2153. Thank you kindly, Godfrey for a patch that solves: osSetDynamicTextureData() produces error on console if ExtraParams passed empty string --- OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs | 8 ++++++++ OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 8 ++++++++ 2 files changed, 16 insertions(+) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs index b410eec..ad58069 100644 --- a/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs @@ -360,6 +360,10 @@ namespace OpenSim.Region.ScriptEngine.Common IDynamicTextureManager textureManager = World.RequestModuleInterface(); if (textureManager != null) { + if (extraParams == String.Empty) + { + extraParams = "256"; + } UUID createdTexture = textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, extraParams, timer); @@ -383,6 +387,10 @@ namespace OpenSim.Region.ScriptEngine.Common IDynamicTextureManager textureManager = World.RequestModuleInterface(); if (textureManager != null) { + if (extraParams == String.Empty) + { + extraParams = "256"; + } UUID createdTexture = textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, extraParams, timer, true, (byte) alpha); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 0f598ea..07d96c6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -229,6 +229,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api IDynamicTextureManager textureManager = World.RequestModuleInterface(); if (textureManager != null) { + if (extraParams == String.Empty) + { + extraParams = "256"; + } UUID createdTexture = textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, extraParams, timer); @@ -258,6 +262,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api IDynamicTextureManager textureManager = World.RequestModuleInterface(); if (textureManager != null) { + if (extraParams == String.Empty) + { + extraParams = "256"; + } UUID createdTexture = textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, extraParams, timer, true, (byte) alpha); -- cgit v1.1