diff options
author | UbitUmarov | 2016-11-25 18:35:23 +0000 |
---|---|---|
committer | UbitUmarov | 2016-11-25 18:35:23 +0000 |
commit | 935510d87956f080f1425982b3da918009c32feb (patch) | |
tree | 4298ca103968aafe9e8381eb74c5ac6dd0cc68eb /OpenSim/Region/ScriptEngine/Shared | |
parent | change llScaleByFactor (sorry Mandarinka). (diff) | |
download | opensim-SC-935510d87956f080f1425982b3da918009c32feb.zip opensim-SC-935510d87956f080f1425982b3da918009c32feb.tar.gz opensim-SC-935510d87956f080f1425982b3da918009c32feb.tar.bz2 opensim-SC-935510d87956f080f1425982b3da918009c32feb.tar.xz |
add llGetMaxScaleFactor and llGetMinScaleFactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
3 files changed, 34 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index c43aef5..a9c5789 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -1828,6 +1828,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1828 | return ScriptBaseClass.FALSE; | 1828 | return ScriptBaseClass.FALSE; |
1829 | } | 1829 | } |
1830 | 1830 | ||
1831 | public LSL_Float llGetMaxScaleFactor() | ||
1832 | { | ||
1833 | m_host.AddScriptLPS(1); | ||
1834 | SceneObjectGroup group = m_host.ParentGroup; | ||
1835 | |||
1836 | if (group == null || group.IsDeleted || group.inTransit) | ||
1837 | return 1.0f; | ||
1838 | |||
1839 | return (LSL_Float)group.GetMaxGroupResizeScale(); | ||
1840 | } | ||
1841 | |||
1842 | public LSL_Float llGetMinScaleFactor() | ||
1843 | { | ||
1844 | m_host.AddScriptLPS(1); | ||
1845 | SceneObjectGroup group = m_host.ParentGroup; | ||
1846 | |||
1847 | if (group == null || group.IsDeleted || group.inTransit) | ||
1848 | return 1.0f; | ||
1849 | |||
1850 | return (LSL_Float)group.GetMinGroupResizeScale(); | ||
1851 | } | ||
1852 | |||
1831 | public void llSetScale(LSL_Vector scale) | 1853 | public void llSetScale(LSL_Vector scale) |
1832 | { | 1854 | { |
1833 | m_host.AddScriptLPS(1); | 1855 | m_host.AddScriptLPS(1); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs index ea0b6f9..cc52403 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | |||
@@ -327,6 +327,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
327 | LSL_Integer llSameGroup(string agent); | 327 | LSL_Integer llSameGroup(string agent); |
328 | void llSay(int channelID, string text); | 328 | void llSay(int channelID, string text); |
329 | LSL_Integer llScaleByFactor(double scaling_factor); | 329 | LSL_Integer llScaleByFactor(double scaling_factor); |
330 | LSL_Float llGetMaxScaleFactor(); | ||
331 | LSL_Float llGetMinScaleFactor(); | ||
330 | void llScaleTexture(double u, double v, int face); | 332 | void llScaleTexture(double u, double v, int face); |
331 | LSL_Integer llScriptDanger(LSL_Vector pos); | 333 | LSL_Integer llScriptDanger(LSL_Vector pos); |
332 | void llScriptProfiler(LSL_Integer flag); | 334 | void llScriptProfiler(LSL_Integer flag); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs index 6aaf930..9d36341 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | |||
@@ -1470,6 +1470,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1470 | return m_LSL_Functions.llScaleByFactor(scaling_factor); | 1470 | return m_LSL_Functions.llScaleByFactor(scaling_factor); |
1471 | } | 1471 | } |
1472 | 1472 | ||
1473 | public LSL_Float llGetMaxScaleFactor() | ||
1474 | { | ||
1475 | return m_LSL_Functions.llGetMaxScaleFactor(); | ||
1476 | } | ||
1477 | |||
1478 | public LSL_Float llGetMinScaleFactor() | ||
1479 | { | ||
1480 | return m_LSL_Functions.llGetMinScaleFactor(); | ||
1481 | } | ||
1482 | |||
1473 | public void llScaleTexture(double u, double v, int face) | 1483 | public void llScaleTexture(double u, double v, int face) |
1474 | { | 1484 | { |
1475 | m_LSL_Functions.llScaleTexture(u, v, face); | 1485 | m_LSL_Functions.llScaleTexture(u, v, face); |