Mantis#2153. Thank you kindly, Godfrey for a patch that solves:
osSetDynamicTextureData() produces error on console if ExtraParams passed empty string0.6.0-stable
parent
291aa9fa10
commit
7305dadba2
|
@ -360,6 +360,10 @@ namespace OpenSim.Region.ScriptEngine.Common
|
||||||
IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
|
IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
|
||||||
if (textureManager != null)
|
if (textureManager != null)
|
||||||
{
|
{
|
||||||
|
if (extraParams == String.Empty)
|
||||||
|
{
|
||||||
|
extraParams = "256";
|
||||||
|
}
|
||||||
UUID createdTexture =
|
UUID createdTexture =
|
||||||
textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
|
textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
|
||||||
extraParams, timer);
|
extraParams, timer);
|
||||||
|
@ -383,6 +387,10 @@ namespace OpenSim.Region.ScriptEngine.Common
|
||||||
IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
|
IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
|
||||||
if (textureManager != null)
|
if (textureManager != null)
|
||||||
{
|
{
|
||||||
|
if (extraParams == String.Empty)
|
||||||
|
{
|
||||||
|
extraParams = "256";
|
||||||
|
}
|
||||||
UUID createdTexture =
|
UUID createdTexture =
|
||||||
textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
|
textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
|
||||||
extraParams, timer, true, (byte) alpha);
|
extraParams, timer, true, (byte) alpha);
|
||||||
|
|
|
@ -229,6 +229,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
|
IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
|
||||||
if (textureManager != null)
|
if (textureManager != null)
|
||||||
{
|
{
|
||||||
|
if (extraParams == String.Empty)
|
||||||
|
{
|
||||||
|
extraParams = "256";
|
||||||
|
}
|
||||||
UUID createdTexture =
|
UUID createdTexture =
|
||||||
textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
|
textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
|
||||||
extraParams, timer);
|
extraParams, timer);
|
||||||
|
@ -258,6 +262,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
|
IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>();
|
||||||
if (textureManager != null)
|
if (textureManager != null)
|
||||||
{
|
{
|
||||||
|
if (extraParams == String.Empty)
|
||||||
|
{
|
||||||
|
extraParams = "256";
|
||||||
|
}
|
||||||
UUID createdTexture =
|
UUID createdTexture =
|
||||||
textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
|
textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data,
|
||||||
extraParams, timer, true, (byte) alpha);
|
extraParams, timer, true, (byte) alpha);
|
||||||
|
|
Loading…
Reference in New Issue