From 0e6e8624ad93ed2669b178a577729e93cdf186e1 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Tue, 16 Sep 2008 18:49:57 +0000 Subject: [PATCH] * 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! --- OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 4 ++-- .../Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 ++-- 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 74935b2632..2f828b04a7 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 { m_host.AddScriptLPS(1); - if (quick_pay_buttons.Data.Length != 4) + if (quick_pay_buttons.Data.Length < 4) { - LSLError("List must have 4 elements"); + LSLError("List must have at least 4 elements"); return; } 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 986439484d..7892b5016a 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 { m_host.AddScriptLPS(1); - if (quick_pay_buttons.Data.Length != 4) + if (quick_pay_buttons.Data.Length < 4) { - LSLError("List must have 4 elements"); + LSLError("List must have at least 4 elements"); return; } m_host.ParentGroup.RootPart.PayPrice[0]=price;