ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix llDeleteSubList() in the case start > end, so it is as spec ie keeps [end + 1, start - 1]. This may break some scripts made for previus broken way ie removed that range. Case start <= end should be as before, just a bit faster (after previus commit)

Browse Source
This commit is contained in:
UbitUmarov
2021-05-29 02:04:57 +01:00
parent 5056b125e9
commit 5c99e94b79
1 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
View File

@@ -990,68 +990,65 @@ namespace OpenSim.Region.ScriptEngine.Shared
// Not an easy one
// If start <= end, remove that part
// if either is negative, count from the end of the array
// if the resulting start > end, remove all BUT that part
// if the resulting start > end, keep [end + 1, start - 1]
Object[] ret;
object[] ret;
if (start < 0)
start=Data.Length+start;
start=Data.Length + start;
if (start < 0)
start=0;
if (end < 0)
end=Data.Length+end;
end=Data.Length + end;
if (end < 0)
end=0;
if (start > end)
{
end++;
if (end >= Data.Length)
return new list(new Object[0]);
return new list(new object[0]);
start--;
if (start >= Data.Length)
start=Data.Length-1;
start = Data.Length - 1;
return GetSublist(end, start);
int num = start - end + 1;
if(num <= 0)
return new list(new object[0]);
ret = new object[num];
Array.Copy(Data, end, ret, 0, num);
return new list(ret);
}
// start >= 0 && end >= 0 here
if (start >= Data.Length)
{
ret=new Object[Data.Length];
ret = new object[Data.Length];
Array.Copy(Data, 0, ret, 0, Data.Length);
return new list(ret);
}
if (end >= Data.Length)
end=Data.Length-1;
end = Data.Length-1;
end++;
// now, this makes the math easier
int remove=end + 1- start;
int remove = end - start;
ret = new Object[Data.Length-remove];
if (ret.Length == 0)
return new list(ret);
if(Data.Length <= remove)
return new list(new object[0]);
/*
int src;
int dest =0;
for (src = 0; src < Data.Length; src++)
{
if (src < start || src > end)
ret[dest++]=Data[src];
}
*/
ret = new object[Data.Length - remove];
if (start > 0)
Array.Copy(Data, 0, ret, 0, start);
end++;
if(end < start || end > Data.Length - 1)
if(end > Data.Length - 1)
return new list(ret);
Array.Copy(Data, end, ret, start, Data.Length - end);