diff options
author | UbitUmarov | 2017-06-26 20:28:16 +0100 |
---|---|---|
committer | UbitUmarov | 2017-06-26 20:28:16 +0100 |
commit | b59ce7c96889d72ddad6babb75cf7b68c885e26c (patch) | |
tree | 545a39202101ed0e5418899d4740061d93adf789 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |
parent | take a few more out of level check (diff) | |
download | opensim-SC_OLD-b59ce7c96889d72ddad6babb75cf7b68c885e26c.zip opensim-SC_OLD-b59ce7c96889d72ddad6babb75cf7b68c885e26c.tar.gz opensim-SC_OLD-b59ce7c96889d72ddad6babb75cf7b68c885e26c.tar.bz2 opensim-SC_OLD-b59ce7c96889d72ddad6babb75cf7b68c885e26c.tar.xz |
also on the actual source file
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 1a88529..823a4e5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -517,13 +517,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
517 | 517 | ||
518 | public LSL_Float osGetTerrainHeight(int x, int y) | 518 | public LSL_Float osGetTerrainHeight(int x, int y) |
519 | { | 519 | { |
520 | CheckThreatLevel(ThreatLevel.None, "osGetTerrainHeight"); | 520 | CheckThreatLevel(); |
521 | return GetTerrainHeight(x, y); | 521 | return GetTerrainHeight(x, y); |
522 | } | 522 | } |
523 | 523 | ||
524 | public LSL_Float osTerrainGetHeight(int x, int y) | 524 | public LSL_Float osTerrainGetHeight(int x, int y) |
525 | { | 525 | { |
526 | CheckThreatLevel(ThreatLevel.None, "osTerrainGetHeight"); | 526 | CheckThreatLevel(); |
527 | OSSLDeprecated("osTerrainGetHeight", "osGetTerrainHeight"); | 527 | OSSLDeprecated("osTerrainGetHeight", "osGetTerrainHeight"); |
528 | return GetTerrainHeight(x, y); | 528 | return GetTerrainHeight(x, y); |
529 | } | 529 | } |
@@ -1518,7 +1518,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1518 | /// <returns></returns> | 1518 | /// <returns></returns> |
1519 | public double osGetCurrentSunHour() | 1519 | public double osGetCurrentSunHour() |
1520 | { | 1520 | { |
1521 | CheckThreatLevel(ThreatLevel.None, "osGetCurrentSunHour"); | 1521 | CheckThreatLevel(); |
1522 | 1522 | ||
1523 | m_host.AddScriptLPS(1); | 1523 | m_host.AddScriptLPS(1); |
1524 | 1524 | ||
@@ -1544,7 +1544,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1544 | 1544 | ||
1545 | public double osGetSunParam(string param) | 1545 | public double osGetSunParam(string param) |
1546 | { | 1546 | { |
1547 | CheckThreatLevel(ThreatLevel.None, "osGetSunParam"); | 1547 | CheckThreatLevel(); |
1548 | return GetSunParam(param); | 1548 | return GetSunParam(param); |
1549 | } | 1549 | } |
1550 | 1550 | ||
@@ -1743,7 +1743,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1743 | // is not allowed to contain any. | 1743 | // is not allowed to contain any. |
1744 | // This really should be removed. | 1744 | // This really should be removed. |
1745 | // | 1745 | // |
1746 | CheckThreatLevel(ThreatLevel.None, "osList2Double"); | 1746 | CheckThreatLevel(); |
1747 | 1747 | ||
1748 | m_host.AddScriptLPS(1); | 1748 | m_host.AddScriptLPS(1); |
1749 | if (index < 0) | 1749 | if (index < 0) |
@@ -2818,7 +2818,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2818 | 2818 | ||
2819 | public LSL_Integer osIsNpc(LSL_Key npc) | 2819 | public LSL_Integer osIsNpc(LSL_Key npc) |
2820 | { | 2820 | { |
2821 | CheckThreatLevel(ThreatLevel.None, "osIsNpc"); | 2821 | CheckThreatLevel(); |
2822 | m_host.AddScriptLPS(1); | 2822 | m_host.AddScriptLPS(1); |
2823 | 2823 | ||
2824 | INPCModule module = World.RequestModuleInterface<INPCModule>(); | 2824 | INPCModule module = World.RequestModuleInterface<INPCModule>(); |
@@ -3539,7 +3539,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3539 | /// <returns></returns> | 3539 | /// <returns></returns> |
3540 | public LSL_Key osGetMapTexture() | 3540 | public LSL_Key osGetMapTexture() |
3541 | { | 3541 | { |
3542 | CheckThreatLevel(ThreatLevel.None, "osGetMapTexture"); | 3542 | // CheckThreatLevel(ThreatLevel.None, "osGetMapTexture"); |
3543 | CheckThreatLevel(); | ||
3543 | m_host.AddScriptLPS(1); | 3544 | m_host.AddScriptLPS(1); |
3544 | 3545 | ||
3545 | return m_ScriptEngine.World.RegionInfo.RegionSettings.TerrainImageID.ToString(); | 3546 | return m_ScriptEngine.World.RegionInfo.RegionSettings.TerrainImageID.ToString(); |
@@ -3597,7 +3598,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3597 | 3598 | ||
3598 | public LSL_Vector osGetRegionSize() | 3599 | public LSL_Vector osGetRegionSize() |
3599 | { | 3600 | { |
3600 | CheckThreatLevel(ThreatLevel.None, "osGetRegionSize"); | 3601 | CheckThreatLevel(); |
3601 | m_host.AddScriptLPS(1); | 3602 | m_host.AddScriptLPS(1); |
3602 | 3603 | ||
3603 | Scene scene = m_ScriptEngine.World; | 3604 | Scene scene = m_ScriptEngine.World; |
@@ -3859,6 +3860,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3859 | /// <returns>Item description</returns> | 3860 | /// <returns>Item description</returns> |
3860 | public LSL_String osGetInventoryDesc(string item) | 3861 | public LSL_String osGetInventoryDesc(string item) |
3861 | { | 3862 | { |
3863 | CheckThreatLevel(); | ||
3862 | m_host.AddScriptLPS(1); | 3864 | m_host.AddScriptLPS(1); |
3863 | 3865 | ||
3864 | lock (m_host.TaskInventory) | 3866 | lock (m_host.TaskInventory) |
@@ -4239,7 +4241,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4239 | /// <returns>1 if thing is a valid UUID, 0 otherwise</returns> | 4241 | /// <returns>1 if thing is a valid UUID, 0 otherwise</returns> |
4240 | public LSL_Integer osIsUUID(string thing) | 4242 | public LSL_Integer osIsUUID(string thing) |
4241 | { | 4243 | { |
4242 | CheckThreatLevel(ThreatLevel.None, "osIsUUID"); | 4244 | CheckThreatLevel(); |
4243 | m_host.AddScriptLPS(1); | 4245 | m_host.AddScriptLPS(1); |
4244 | 4246 | ||
4245 | UUID test; | 4247 | UUID test; |
@@ -4254,7 +4256,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4254 | /// <returns></returns> | 4256 | /// <returns></returns> |
4255 | public LSL_Float osMin(double a, double b) | 4257 | public LSL_Float osMin(double a, double b) |
4256 | { | 4258 | { |
4257 | CheckThreatLevel(ThreatLevel.None, "osMin"); | 4259 | CheckThreatLevel(); |
4258 | m_host.AddScriptLPS(1); | 4260 | m_host.AddScriptLPS(1); |
4259 | 4261 | ||
4260 | return Math.Min(a, b); | 4262 | return Math.Min(a, b); |
@@ -4268,7 +4270,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4268 | /// <returns></returns> | 4270 | /// <returns></returns> |
4269 | public LSL_Float osMax(double a, double b) | 4271 | public LSL_Float osMax(double a, double b) |
4270 | { | 4272 | { |
4271 | CheckThreatLevel(ThreatLevel.None, "osMax"); | 4273 | CheckThreatLevel(); |
4272 | m_host.AddScriptLPS(1); | 4274 | m_host.AddScriptLPS(1); |
4273 | 4275 | ||
4274 | return Math.Max(a, b); | 4276 | return Math.Max(a, b); |