aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs19
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs13
-rw-r--r--bin/config-include/osslEnable.ini5
4 files changed, 29 insertions, 13 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index e93a7d7..dee195a 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
1154 1154
1155 //Texture draw functions 1155 //Texture draw functions
1156 1156
1157 public string osDrawTranslationTransform(string drawList, LSL_Float x, LSL_Float y) 1157 public string osDrawResetTransform(string drawList)
1158 { 1158 {
1159 CheckThreatLevel(); 1159 CheckThreatLevel();
1160
1161 m_host.AddScriptLPS(1); 1160 m_host.AddScriptLPS(1);
1162 drawList += "TransTransf " + x + "," + y + ";"; 1161 drawList += "ResetTransf;";
1163 return drawList; 1162 return drawList;
1164 } 1163 }
1165 1164
@@ -1171,11 +1170,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1171 return drawList; 1170 return drawList;
1172 } 1171 }
1173 1172
1174 public string osDrawResetTransform(string drawList) 1173 public string osDrawScaleTransform(string drawList, LSL_Float x, LSL_Float y)
1175 { 1174 {
1176 CheckThreatLevel(); 1175 CheckThreatLevel();
1176
1177 m_host.AddScriptLPS(1); 1177 m_host.AddScriptLPS(1);
1178 drawList += "ResetTransf;"; 1178 drawList += "ScaleTransf " + x + "," + y + ";";
1179 return drawList;
1180 }
1181
1182 public string osDrawTranslationTransform(string drawList, LSL_Float x, LSL_Float y)
1183 {
1184 CheckThreatLevel();
1185
1186 m_host.AddScriptLPS(1);
1187 drawList += "TransTransf " + x + "," + y + ";";
1179 return drawList; 1188 return drawList;
1180 } 1189 }
1181 1190
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 19cfcc1..f7857da 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
228 string osDrawFilledRectangle(string drawList, int width, int height); 228 string osDrawFilledRectangle(string drawList, int width, int height);
229 string osDrawPolygon(string drawList, LSL_List x, LSL_List y); 229 string osDrawPolygon(string drawList, LSL_List x, LSL_List y);
230 string osDrawFilledPolygon(string drawList, LSL_List x, LSL_List y); 230 string osDrawFilledPolygon(string drawList, LSL_List x, LSL_List y);
231 string osDrawTranslationTransform(string drawList, LSL_Float x, LSL_Float y);
232 string osDrawRotationTransform(string drawList, LSL_Float x);
233 string osDrawResetTransform(string drawList); 231 string osDrawResetTransform(string drawList);
232 string osDrawRotationTransform(string drawList, LSL_Float x);
233 string osDrawScaleTransform(string drawList, LSL_Float x, LSL_Float y);
234 string osDrawTranslationTransform(string drawList, LSL_Float x, LSL_Float y);
234 string osSetFontName(string drawList, string fontName); 235 string osSetFontName(string drawList, string fontName);
235 string osSetFontSize(string drawList, int fontSize); 236 string osSetFontSize(string drawList, int fontSize);
236 string osSetPenSize(string drawList, int penSize); 237 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 4b1f6d3..d6af32b 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
386 return m_OSSL_Functions.osDrawFilledPolygon(drawList, x, y); 386 return m_OSSL_Functions.osDrawFilledPolygon(drawList, x, y);
387 } 387 }
388 388
389 public string osDrawTranslationTransform(string drawList, LSL_Float x, LSL_Float y) 389 public string osDrawResetTransform(string drawList)
390 { 390 {
391 return m_OSSL_Functions.osDrawTranslationTransform(drawList, x, y); 391 return m_OSSL_Functions.osDrawResetTransform(drawList);
392 } 392 }
393 393
394 public string osDrawRotationTransform(string drawList, LSL_Float x) 394 public string osDrawRotationTransform(string drawList, LSL_Float x)
@@ -396,9 +396,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
396 return m_OSSL_Functions.osDrawRotationTransform(drawList, x); 396 return m_OSSL_Functions.osDrawRotationTransform(drawList, x);
397 } 397 }
398 398
399 public string osDrawResetTransform(string drawList) 399 public string osDrawScaleTransform(string drawList, LSL_Float x, LSL_Float y)
400 { 400 {
401 return m_OSSL_Functions.osDrawResetTransform(drawList); 401 return m_OSSL_Functions.osDrawScaleTransform(drawList, x, y);
402 }
403
404 public string osDrawTranslationTransform(string drawList, LSL_Float x, LSL_Float y)
405 {
406 return m_OSSL_Functions.osDrawTranslationTransform(drawList, x, y);
402 } 407 }
403 408
404 public string osSetFontSize(string drawList, int fontSize) 409 public string osSetFontSize(string drawList, int fontSize)
diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini
index 4779f60..6481825 100644
--- a/bin/config-include/osslEnable.ini
+++ b/bin/config-include/osslEnable.ini
@@ -73,9 +73,10 @@
73; Allow_osDrawFilledEllipse = true ; no level check 73; Allow_osDrawFilledEllipse = true ; no level check
74; Allow_osDrawFilledPolygon = true ; no level check 74; Allow_osDrawFilledPolygon = true ; no level check
75; Allow_osDrawFilledRectangle = true ; no level check 75; Allow_osDrawFilledRectangle = true ; no level check
76; Allow_osDrawTranslationTransform = true ; no level check
77; Allow_osDrawRotationTransform = true ; no level check
78; Allow_osDrawResetTransform = true ; no level check 76; Allow_osDrawResetTransform = true ; no level check
77; Allow_osDrawRotationTransform = true ; no level check
78; Allow_osDrawScaleTransform = true ; no level check
79; Allow_osDrawTranslationTransform = true ; no level check
79; Allow_osDrawImage = true ; no level check 80; Allow_osDrawImage = true ; no level check
80; Allow_osDrawLine = true ; no level check 81; Allow_osDrawLine = true ; no level check
81; Allow_osDrawPolygon = true ; no level check 82; Allow_osDrawPolygon = true ; no level check