diff options
| author | Melanie | 2010-02-16 23:15:59 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-16 23:15:59 +0000 |
| commit | 92a8d7ce6c7a4e87d86c71379b0e35493a986a92 (patch) | |
| tree | b097fadc081ea80b46f954a334c03379ccc01a28 | |
| parent | Change a condition to actually make linden land reclaim work (diff) | |
| parent | Fix an inconsistency in llSetPayPrice between SL and OS behaviour (diff) | |
| download | opensim-SC-92a8d7ce6c7a4e87d86c71379b0e35493a986a92.zip opensim-SC-92a8d7ce6c7a4e87d86c71379b0e35493a986a92.tar.gz opensim-SC-92a8d7ce6c7a4e87d86c71379b0e35493a986a92.tar.bz2 opensim-SC-92a8d7ce6c7a4e87d86c71379b0e35493a986a92.tar.xz | |
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 9db8ca0..824073b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -8968,9 +8968,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 8968 | m_host.AddScriptLPS(1); | 8968 | m_host.AddScriptLPS(1); |
| 8969 | 8969 | ||
| 8970 | if (quick_pay_buttons.Data.Length < 4) | 8970 | if (quick_pay_buttons.Data.Length < 4) |
| 8971 | { | 8971 | { |
| 8972 | LSLError("List must have at least 4 elements"); | 8972 | int x; |
| 8973 | return; | 8973 | for (x=quick_pay_buttons.Data.Length; x<= 4; x++) |
| 8974 | { | ||
| 8975 | quick_pay_buttons.Add(ScriptBaseClass.PAY_HIDE); | ||
| 8976 | } | ||
| 8974 | } | 8977 | } |
| 8975 | int[] nPrice = new int[5]; | 8978 | int[] nPrice = new int[5]; |
| 8976 | nPrice[0]=price; | 8979 | nPrice[0]=price; |