diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index e93a7d76ae..dee195a2ec 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -1154,12 +1154,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api //Texture draw functions - public string osDrawTranslationTransform(string drawList, LSL_Float x, LSL_Float y) + public string osDrawResetTransform(string drawList) { CheckThreatLevel(); - m_host.AddScriptLPS(1); - drawList += "TransTransf " + x + "," + y + ";"; + drawList += "ResetTransf;"; return drawList; } @@ -1171,11 +1170,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return drawList; } - public string osDrawResetTransform(string drawList) + public string osDrawScaleTransform(string drawList, LSL_Float x, LSL_Float y) { CheckThreatLevel(); + m_host.AddScriptLPS(1); - drawList += "ResetTransf;"; + drawList += "ScaleTransf " + x + "," + y + ";"; + return drawList; + } + + public string osDrawTranslationTransform(string drawList, LSL_Float x, LSL_Float y) + { + CheckThreatLevel(); + + m_host.AddScriptLPS(1); + drawList += "TransTransf " + x + "," + y + ";"; return drawList; } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 19cfcc1a8c..f7857da7a8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs @@ -228,9 +228,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces string osDrawFilledRectangle(string drawList, int width, int height); string osDrawPolygon(string drawList, LSL_List x, LSL_List y); string osDrawFilledPolygon(string drawList, LSL_List x, LSL_List y); - string osDrawTranslationTransform(string drawList, LSL_Float x, LSL_Float y); - string osDrawRotationTransform(string drawList, LSL_Float x); string osDrawResetTransform(string drawList); + string osDrawRotationTransform(string drawList, LSL_Float x); + string osDrawScaleTransform(string drawList, LSL_Float x, LSL_Float y); + string osDrawTranslationTransform(string drawList, LSL_Float x, LSL_Float y); string osSetFontName(string drawList, string fontName); string osSetFontSize(string drawList, int fontSize); string osSetPenSize(string drawList, int penSize); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index 4b1f6d300e..d6af32b4b9 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs @@ -386,9 +386,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase return m_OSSL_Functions.osDrawFilledPolygon(drawList, x, y); } - public string osDrawTranslationTransform(string drawList, LSL_Float x, LSL_Float y) + public string osDrawResetTransform(string drawList) { - return m_OSSL_Functions.osDrawTranslationTransform(drawList, x, y); + return m_OSSL_Functions.osDrawResetTransform(drawList); } public string osDrawRotationTransform(string drawList, LSL_Float x) @@ -396,9 +396,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase return m_OSSL_Functions.osDrawRotationTransform(drawList, x); } - public string osDrawResetTransform(string drawList) + public string osDrawScaleTransform(string drawList, LSL_Float x, LSL_Float y) { - return m_OSSL_Functions.osDrawResetTransform(drawList); + return m_OSSL_Functions.osDrawScaleTransform(drawList, x, y); + } + + public string osDrawTranslationTransform(string drawList, LSL_Float x, LSL_Float y) + { + return m_OSSL_Functions.osDrawTranslationTransform(drawList, x, y); } public string osSetFontSize(string drawList, int fontSize) diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini index 4779f60385..648182503f 100644 --- a/bin/config-include/osslEnable.ini +++ b/bin/config-include/osslEnable.ini @@ -73,9 +73,10 @@ ; Allow_osDrawFilledEllipse = true ; no level check ; Allow_osDrawFilledPolygon = true ; no level check ; Allow_osDrawFilledRectangle = true ; no level check -; Allow_osDrawTranslationTransform = true ; no level check -; Allow_osDrawRotationTransform = true ; no level check ; Allow_osDrawResetTransform = true ; no level check +; Allow_osDrawRotationTransform = true ; no level check +; Allow_osDrawScaleTransform = true ; no level check +; Allow_osDrawTranslationTransform = true ; no level check ; Allow_osDrawImage = true ; no level check ; Allow_osDrawLine = true ; no level check ; Allow_osDrawPolygon = true ; no level check