diff options
author | UbitUmarov | 2017-06-24 09:24:56 +0100 |
---|---|---|
committer | UbitUmarov | 2017-06-24 09:24:56 +0100 |
commit | 1a8a77c41e4061b75ff97fcf89e39717550bfa25 (patch) | |
tree | 325976c8554389b0b566db57eb71a6816ae15291 /OpenSim/Region/ScriptEngine/Shared/Api | |
parent | simplify vectorrender background draw (diff) | |
download | opensim-SC_OLD-1a8a77c41e4061b75ff97fcf89e39717550bfa25.zip opensim-SC_OLD-1a8a77c41e4061b75ff97fcf89e39717550bfa25.tar.gz opensim-SC_OLD-1a8a77c41e4061b75ff97fcf89e39717550bfa25.tar.bz2 opensim-SC_OLD-1a8a77c41e4061b75ff97fcf89e39717550bfa25.tar.xz |
revert the thread level change; remove unused dynamic texture timer from internal code; let blend alpha work if < 255; let blend work with the selected face; etc
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 7371fc5..3a0884f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -678,7 +678,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
678 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); | 678 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); |
679 | UUID createdTexture = | 679 | UUID createdTexture = |
680 | textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url, | 680 | textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url, |
681 | extraParams, timer); | 681 | extraParams); |
682 | return createdTexture.ToString(); | 682 | return createdTexture.ToString(); |
683 | } | 683 | } |
684 | else | 684 | else |
@@ -700,7 +700,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
700 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); | 700 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); |
701 | UUID createdTexture = | 701 | UUID createdTexture = |
702 | textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url, | 702 | textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url, |
703 | extraParams, timer, true, (byte) alpha); | 703 | extraParams, true, (byte) alpha); |
704 | return createdTexture.ToString(); | 704 | return createdTexture.ToString(); |
705 | } | 705 | } |
706 | else | 706 | else |
@@ -722,7 +722,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
722 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); | 722 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); |
723 | UUID createdTexture = | 723 | UUID createdTexture = |
724 | textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url, | 724 | textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url, |
725 | extraParams, timer, blend, disp, (byte) alpha, face); | 725 | extraParams, blend, disp, (byte) alpha, face); |
726 | return createdTexture.ToString(); | 726 | return createdTexture.ToString(); |
727 | } | 727 | } |
728 | else | 728 | else |
@@ -756,7 +756,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
756 | } | 756 | } |
757 | UUID createdTexture = | 757 | UUID createdTexture = |
758 | textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, | 758 | textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, |
759 | extraParams, timer, false, 3, 255, face); | 759 | extraParams, false, 3, 255, face); |
760 | 760 | ||
761 | return createdTexture.ToString(); | 761 | return createdTexture.ToString(); |
762 | } | 762 | } |
@@ -786,7 +786,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
786 | } | 786 | } |
787 | UUID createdTexture = | 787 | UUID createdTexture = |
788 | textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, | 788 | textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, |
789 | extraParams, timer, true, (byte) alpha); | 789 | extraParams, true, (byte) alpha); |
790 | return createdTexture.ToString(); | 790 | return createdTexture.ToString(); |
791 | } | 791 | } |
792 | } | 792 | } |
@@ -801,7 +801,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
801 | public string osSetDynamicTextureDataBlendFace(string dynamicID, string contentType, string data, string extraParams, | 801 | public string osSetDynamicTextureDataBlendFace(string dynamicID, string contentType, string data, string extraParams, |
802 | bool blend, int disp, int timer, int alpha, int face) | 802 | bool blend, int disp, int timer, int alpha, int face) |
803 | { | 803 | { |
804 | CheckThreatLevel(ThreatLevel.VeryHigh , "osSetDynamicTextureDataBlendFace"); | 804 | CheckThreatLevel(ThreatLevel.VeryLow , "osSetDynamicTextureDataBlendFace"); |
805 | 805 | ||
806 | m_host.AddScriptLPS(1); | 806 | m_host.AddScriptLPS(1); |
807 | if (dynamicID == String.Empty) | 807 | if (dynamicID == String.Empty) |
@@ -815,7 +815,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
815 | } | 815 | } |
816 | UUID createdTexture = | 816 | UUID createdTexture = |
817 | textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, | 817 | textureManager.AddDynamicTextureData(World.RegionInfo.RegionID, m_host.UUID, contentType, data, |
818 | extraParams, timer, blend, disp, (byte) alpha, face); | 818 | extraParams, blend, disp, (byte) alpha, face); |
819 | return createdTexture.ToString(); | 819 | return createdTexture.ToString(); |
820 | } | 820 | } |
821 | } | 821 | } |