AriasCreations/AVsitter
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

merge into: AriasCreations:master
Branches Tags
AriasCreations:master
AriasCreations:v2.2-03.01
AriasCreations:2.2-03.01
AriasCreations:2.2-03
AriasCreations:2.2-02.02
AriasCreations:2.2-02.01
AriasCreations:2.2-02
AriasCreations:2.2-01
...
pull from: AriasCreations:v2.2-03.01
Branches Tags
AriasCreations:master
AriasCreations:v2.2-03.01
AriasCreations:2.2-03.01
AriasCreations:2.2-03
AriasCreations:2.2-02.02
AriasCreations:2.2-02.01
AriasCreations:2.2-02
AriasCreations:2.2-01

1 commit
master ... v2.2-03.01

Author SHA1 Message Date
Sei Lisa
2e5521267c Allow "-1" in description to be after "#" character, take 2. 
This is a safer way to implement #66, as that fix broke [AV]select.
 2018-03-04 02:17:56 +01:00
1 changed files with 12 additions and 8 deletions
Show stats Expand all files Collapse all files

20
AVsitter2/[AV]sitA.lsl
View file

@ -177,7 +177,8 @@ wipe_sit_targets()
integer i;
for (; i <= llGetNumberOfPrims(); i++)
{
if ((string)llGetLinkPrimitiveParams(i, [PRIM_DESC]) != "-1")
string DESC = (string)llGetLinkPrimitiveParams(i, [PRIM_DESC]);
if (DESC != "-1" && "#-1" != llGetSubString(DESC, -3, -1))
{
llLinkSitTarget(i, ZERO_VECTOR, ZERO_ROTATION);
}
@ -220,11 +221,11 @@ sittargets()
for (i = 1; i <= prims; i++) // FIXME: will this work for single prim in OpenSim?
{
integer next = llListFindList(SITTERS_SITTARGETS, [1000]);
string desc = (string)llGetLinkPrimitiveParams(i, [PRIM_DESC]);
desc = llGetSubString(desc, llSubStringIndex(desc, "#") + 1, 99999);
if (desc != "-1")
string DESC = (string)llGetLinkPrimitiveParams(i, [PRIM_DESC]);
DESC = llGetSubString(DESC, llSubStringIndex(DESC, "#") + 1, 99999);
if (DESC != "-1")
{
list data = llParseStringKeepNulls(desc, ["-"], []);
list data = llParseStringKeepNulls(DESC, ["-"], []);
if (llGetListLength(data) == 2 && IsInteger(llList2String(data, 0)) && IsInteger(llList2String(data, 1)))
{
if (llList2Integer(data, 0) == SET)
@ -315,7 +316,8 @@ set_sittarget()
{
target = 0;
}
if ((string)llGetLinkPrimitiveParams(target, [PRIM_DESC]) != "-1")
string DESC = (string)llGetLinkPrimitiveParams(target, [PRIM_DESC]);
if (DESC != "-1" && "#-1" != llGetSubString(DESC, -3, -1))
{
llLinkSitTarget(target, target_pos - <0.,0.,0.4> + llRot2Up(target_rot) * 0.05, target_rot);
}
@ -477,7 +479,8 @@ default
// wipe_sit_targets() inlined here:
for (i = 0; i <= llGetNumberOfPrims(); i++)
{
if ((string)llGetLinkPrimitiveParams(i, [PRIM_DESC]) != "-1")
string DESC = (string)llGetLinkPrimitiveParams(i, [PRIM_DESC]);
if (DESC != "-1" && "#-1" != llGetSubString(DESC, -3, -1))
{
llLinkSitTarget(i, ZERO_VECTOR, ZERO_ROTATION);
}
@ -1046,7 +1049,8 @@ default
// wipe_sit_targets() inlined here:
for (i = 0; i <= llGetNumberOfPrims(); i++)
{
if ((string)llGetLinkPrimitiveParams(i, [PRIM_DESC]) != "-1")
string DESC = (string)llGetLinkPrimitiveParams(i, [PRIM_DESC]);
if (DESC != "-1" && "#-1" != llGetSubString(DESC, -3, -1))
{
llLinkSitTarget(i, ZERO_VECTOR, ZERO_ROTATION);
}