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

Revert "Allow "-1" in description to be after "#" character"

Browse source 
This reverts commit e4064605a1.
This commit is contained in:
Sei Lisa 2018-03-04 00:55:20 +01:00 • committed by Sei-Lisa
parent 57c8176afa
commit bb1cf35948
1 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
AVsitter2/[AV]sitA.lsl
View file

@ -67,7 +67,7 @@ key notecard_key;
key notecard_query; key notecard_query;
integer reading_notecard_section; integer reading_notecard_section;
integer notecard_lines; integer notecard_lines;
string reused_key; key reused_key;
integer reused_variable; integer reused_variable;
integer my_sittarget; integer my_sittarget;
integer original_my_sittarget; integer original_my_sittarget;
@ -177,8 +177,7 @@ wipe_sit_targets()
integer i; integer i;
for (; i <= llGetNumberOfPrims(); i++) for (; i <= llGetNumberOfPrims(); i++)
{ {
string desc = (string)llGetLinkPrimitiveParams(i, [PRIM_DESC]); if ((string)llGetLinkPrimitiveParams(i, [PRIM_DESC]) != "-1")
if (desc != "-1" && llGetSubString(desc, -3, -1) != "#-1")
{ {
llLinkSitTarget(i, ZERO_VECTOR, ZERO_ROTATION); llLinkSitTarget(i, ZERO_VECTOR, ZERO_ROTATION);
} }
@ -316,8 +315,7 @@ set_sittarget()
{ {
target = 0; target = 0;
} }
reused_key = (string)llGetLinkPrimitiveParams(target, [PRIM_DESC]); if ((string)llGetLinkPrimitiveParams(target, [PRIM_DESC]) != "-1")
if (reused_key != "-1" && llGetSubString(reused_key, -3, -1) != "#-1")
{ {
llLinkSitTarget(target, target_pos - <0.,0.,0.4> + llRot2Up(target_rot) * 0.05, target_rot); llLinkSitTarget(target, target_pos - <0.,0.,0.4> + llRot2Up(target_rot) * 0.05, target_rot);
} }
@ -479,8 +477,7 @@ default
// wipe_sit_targets() inlined here: // wipe_sit_targets() inlined here:
for (i = 0; i <= llGetNumberOfPrims(); i++) for (i = 0; i <= llGetNumberOfPrims(); i++)
{ {
reused_key = (string)llGetLinkPrimitiveParams(i, [PRIM_DESC]); if ((string)llGetLinkPrimitiveParams(i, [PRIM_DESC]) != "-1")
if (reused_key != "-1" && llGetSubString(reused_key, -3, -1) != "#-1")
{ {
llLinkSitTarget(i, ZERO_VECTOR, ZERO_ROTATION); llLinkSitTarget(i, ZERO_VECTOR, ZERO_ROTATION);
} }
@ -684,12 +681,12 @@ default
if (one == SCRIPT_CHANNEL || two == SCRIPT_CHANNEL) if (one == SCRIPT_CHANNEL || two == SCRIPT_CHANNEL)
{ {
end_sitter(); end_sitter();
reused_key = llList2String(SITTERS, one); reused_key = llList2Key(SITTERS, one);
if (one == SCRIPT_CHANNEL) if (one == SCRIPT_CHANNEL)
{ {
reused_key = llList2String(SITTERS, two); reused_key = llList2Key(SITTERS, two);
} }
if ((key)reused_key) // OSS::if (osIsUUID(reused_key) && reused_key != NULL_KEY) if (reused_key) // OSS::if (osIsUUID(reused_key) && reused_key != NULL_KEY)
{ {
SWAPPED = TRUE; SWAPPED = TRUE;
llRequestPermissions(reused_key, PERMISSION_TRIGGER_ANIMATION); llRequestPermissions(reused_key, PERMISSION_TRIGGER_ANIMATION);
@ -1049,8 +1046,7 @@ default
// wipe_sit_targets() inlined here: // wipe_sit_targets() inlined here:
for (i = 0; i <= llGetNumberOfPrims(); i++) for (i = 0; i <= llGetNumberOfPrims(); i++)
{ {
reused_key = (string)llGetLinkPrimitiveParams(i, [PRIM_DESC]); if ((string)llGetLinkPrimitiveParams(i, [PRIM_DESC]) != "-1")
if (reused_key != "-1" && llGetSubString(reused_key, -3, -1) != "#-1")
{ {
llLinkSitTarget(i, ZERO_VECTOR, ZERO_ROTATION); llLinkSitTarget(i, ZERO_VECTOR, ZERO_ROTATION);
} }