diff options
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Common/OSSL_BuilIn_Commands.cs | 8 | ||||
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 8 |
2 files changed, 16 insertions, 0 deletions
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 | |||
| 360 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); | 360 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); |
| 361 | if (textureManager != null) | 361 | if (textureManager != null) |
| 362 | { | 362 | { |
| 363 | if (extraParams == String.Empty) | ||
| 364 | { | ||
| 365 | extraParams = "256"; | ||
| 366 | } | ||
| 363 | UUID createdTexture = | 367 | UUID createdTexture = |
| 364 | textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, | 368 | textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, |
| 365 | extraParams, timer); | 369 | extraParams, timer); |
| @@ -383,6 +387,10 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
| 383 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); | 387 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); |
| 384 | if (textureManager != null) | 388 | if (textureManager != null) |
| 385 | { | 389 | { |
| 390 | if (extraParams == String.Empty) | ||
| 391 | { | ||
| 392 | extraParams = "256"; | ||
| 393 | } | ||
| 386 | UUID createdTexture = | 394 | UUID createdTexture = |
| 387 | textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, | 395 | textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, |
| 388 | extraParams, timer, true, (byte) alpha); | 396 | 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 | |||
| 229 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); | 229 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); |
| 230 | if (textureManager != null) | 230 | if (textureManager != null) |
| 231 | { | 231 | { |
| 232 | if (extraParams == String.Empty) | ||
| 233 | { | ||
| 234 | extraParams = "256"; | ||
| 235 | } | ||
| 232 | UUID createdTexture = | 236 | UUID createdTexture = |
| 233 | textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, | 237 | textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, |
| 234 | extraParams, timer); | 238 | extraParams, timer); |
| @@ -258,6 +262,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 258 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); | 262 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); |
| 259 | if (textureManager != null) | 263 | if (textureManager != null) |
| 260 | { | 264 | { |
| 265 | if (extraParams == String.Empty) | ||
| 266 | { | ||
| 267 | extraParams = "256"; | ||
| 268 | } | ||
| 261 | UUID createdTexture = | 269 | UUID createdTexture = |
| 262 | textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, | 270 | textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, |
| 263 | extraParams, timer, true, (byte) alpha); | 271 | extraParams, timer, true, (byte) alpha); |