diff options
author | UbitUmarov | 2017-06-24 06:11:10 +0100 |
---|---|---|
committer | UbitUmarov | 2017-06-24 06:11:10 +0100 |
commit | ed8fc359f3853bab07ec3f5d6fd533da8d3797be (patch) | |
tree | d73fd3315a4859a8c194498baec135041e46417b | |
parent | remove a DynamicTexture leak, make it actually return the new texture ID to o... (diff) | |
download | opensim-SC-ed8fc359f3853bab07ec3f5d6fd533da8d3797be.zip opensim-SC-ed8fc359f3853bab07ec3f5d6fd533da8d3797be.tar.gz opensim-SC-ed8fc359f3853bab07ec3f5d6fd533da8d3797be.tar.bz2 opensim-SC-ed8fc359f3853bab07ec3f5d6fd533da8d3797be.tar.xz |
change thread level of osSetDynamicTextureDataBlendFace to VeryHigh
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 | ||||
-rw-r--r-- | bin/config-include/osslEnable.ini | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index d782ee6..7371fc5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -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.VeryLow, "osSetDynamicTextureDataBlendFace"); | 804 | CheckThreatLevel(ThreatLevel.VeryHigh , "osSetDynamicTextureDataBlendFace"); |
805 | 805 | ||
806 | m_host.AddScriptLPS(1); | 806 | m_host.AddScriptLPS(1); |
807 | if (dynamicID == String.Empty) | 807 | if (dynamicID == String.Empty) |
diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini index f9bfe03..3538458 100644 --- a/bin/config-include/osslEnable.ini +++ b/bin/config-include/osslEnable.ini | |||
@@ -121,7 +121,6 @@ | |||
121 | Allow_osReplaceString = true | 121 | Allow_osReplaceString = true |
122 | Allow_osSetDynamicTextureData = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER | 122 | Allow_osSetDynamicTextureData = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER |
123 | Allow_osSetDynamicTextureDataBlend = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER | 123 | Allow_osSetDynamicTextureDataBlend = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER |
124 | Allow_osSetDynamicTextureDataBlendFace = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER | ||
125 | Allow_osSetDynamicTextureURL = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER | 124 | Allow_osSetDynamicTextureURL = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER |
126 | Allow_osSetDynamicTextureURLBlend = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER | 125 | Allow_osSetDynamicTextureURLBlend = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER |
127 | Allow_osSetDynamicTextureURLBlendFace = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER | 126 | Allow_osSetDynamicTextureURLBlendFace = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER |
@@ -228,6 +227,7 @@ | |||
228 | Allow_osGetNotecardLine = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER | 227 | Allow_osGetNotecardLine = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER |
229 | Allow_osGetNumberOfNotecardLines = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER | 228 | Allow_osGetNumberOfNotecardLines = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER |
230 | Allow_osRegionNotice = ESTATE_MANAGER,ESTATE_OWNER | 229 | Allow_osRegionNotice = ESTATE_MANAGER,ESTATE_OWNER |
230 | Allow_osSetDynamicTextureDataBlendFace = ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER | ||
231 | Allow_osSetRot = false | 231 | Allow_osSetRot = false |
232 | Allow_osSetParcelDetails = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER | 232 | Allow_osSetParcelDetails = ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER |
233 | 233 | ||