OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

also on another location, plus a bit clean

avinationmerge
UbitUmarov 2015-10-02 18:39:05 +01:00
parent de51b7af85
commit b8cb9d1bbb
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -7909,19 +7909,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
Error("llDialog", "First parameter must be a key"); Error("llDialog", "First parameter must be a key");
return; return;
} }
if (buttons.Length < 1)
int length = buttons.Length;
if (length < 1)
{ {
Error("llDialog", "At least 1 button must be shown"); Error("llDialog", "At least 1 button must be shown");
return; return;
} }
if (buttons.Length > 12) if (length > 12)
{ {
Error("llDialog", "No more than 12 buttons can be shown"); Error("llDialog", "No more than 12 buttons can be shown");
return; return;
} }
int length = buttons.Length;
if (length > 12)
length = 12;
string[] buts = new string[length]; string[] buts = new string[length];
for (int i = 0; i < length; i++) for (int i = 0; i < length; i++)
@ -9924,9 +9923,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (part.ParentGroup.RootPart == part) if (part.ParentGroup.RootPart == part)
{ {
SceneObjectGroup parent = part.ParentGroup; SceneObjectGroup parent = part.ParentGroup;
Util.FireAndForget(delegate(object x) { // Util.FireAndForget(delegate(object x) {
parent.UpdateGroupPosition(currentPosition); parent.UpdateGroupPosition(currentPosition);
}); // });
} }
else else
{ {
@ -14388,6 +14387,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return list; return list;
} }
// this is wrong, except on a few trivial cases
// keeping it for now just for raycast v3
/// <summary> /// <summary>
/// Helper to calculate bounding box of an avatar. /// Helper to calculate bounding box of an avatar.
/// </summary> /// </summary>