aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-09-16 18:49:57 +0000
committerJustin Clarke Casey2008-09-16 18:49:57 +0000
commit0e6e8624ad93ed2669b178a577729e93cdf186e1 (patch)
tree578779bc8d8a8d23f0201bc16f554bcb7501e3f8
parentadd an inventory change test. (diff)
downloadopensim-SC-0e6e8624ad93ed2669b178a577729e93cdf186e1.zip
opensim-SC-0e6e8624ad93ed2669b178a577729e93cdf186e1.tar.gz
opensim-SC-0e6e8624ad93ed2669b178a577729e93cdf186e1.tar.bz2
opensim-SC-0e6e8624ad93ed2669b178a577729e93cdf186e1.tar.xz
* Apply http://opensimulator.org/mantis/view.php?id=2205 with a few small tweaks
* LSL Conformance: llSetPayPrice should accept more than four arguments in list * Thanks kcozens!
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 74935b2..2f828b0 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -7474,9 +7474,9 @@ namespace OpenSim.Region.ScriptEngine.Common
7474 { 7474 {
7475 m_host.AddScriptLPS(1); 7475 m_host.AddScriptLPS(1);
7476 7476
7477 if (quick_pay_buttons.Data.Length != 4) 7477 if (quick_pay_buttons.Data.Length < 4)
7478 { 7478 {
7479 LSLError("List must have 4 elements"); 7479 LSLError("List must have at least 4 elements");
7480 return; 7480 return;
7481 } 7481 }
7482 m_host.ParentGroup.RootPart.PayPrice[0]=price; 7482 m_host.ParentGroup.RootPart.PayPrice[0]=price;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 9864394..7892b50 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7279,9 +7279,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7279 { 7279 {
7280 m_host.AddScriptLPS(1); 7280 m_host.AddScriptLPS(1);
7281 7281
7282 if (quick_pay_buttons.Data.Length != 4) 7282 if (quick_pay_buttons.Data.Length < 4)
7283 { 7283 {
7284 LSLError("List must have 4 elements"); 7284 LSLError("List must have at least 4 elements");
7285 return; 7285 return;
7286 } 7286 }
7287 m_host.ParentGroup.RootPart.PayPrice[0]=price; 7287 m_host.ParentGroup.RootPart.PayPrice[0]=price;