* 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!

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
         {
             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 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
         {
             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;