From b8cb9d1bbbb127abe90141376d4c78eed5973c96 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 2 Oct 2015 18:39:05 +0100 Subject: [PATCH] also on another location, plus a bit clean --- .../Shared/Api/Implementation/LSL_Api.cs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 694f8a1586..0649a6a2ac 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -7909,19 +7909,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api Error("llDialog", "First parameter must be a key"); return; } - if (buttons.Length < 1) + + int length = buttons.Length; + if (length < 1) { Error("llDialog", "At least 1 button must be shown"); return; } - if (buttons.Length > 12) + if (length > 12) { Error("llDialog", "No more than 12 buttons can be shown"); return; } - int length = buttons.Length; - if (length > 12) - length = 12; string[] buts = new string[length]; for (int i = 0; i < length; i++) @@ -9924,9 +9923,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (part.ParentGroup.RootPart == part) { SceneObjectGroup parent = part.ParentGroup; - Util.FireAndForget(delegate(object x) { +// Util.FireAndForget(delegate(object x) { parent.UpdateGroupPosition(currentPosition); - }); +// }); } else { @@ -14388,6 +14387,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return list; } + + // this is wrong, except on a few trivial cases + // keeping it for now just for raycast v3 + /// /// Helper to calculate bounding box of an avatar. ///