Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nikki lacrima patch runaway #1010

Conversation

NikkiLacrima
Copy link

No description provided.

Check for empty owners list in oc_spy.lsl
Remove extra CMD_SAFEWORD to CMD_RELAY_SAFEWORD processing
Listens for "runaway_confirmed" from oc_api instead of "runaway"
Removed g_lMenuIDs.
@NikkiLacrima
Copy link
Author

Updated runaway handling as discussed in issue #1001
Also removed g_lMenuIDs in these files see #963

@NikkiLacrima NikkiLacrima added Do Not Merge (yet) One reason or another for not merging 8.3 Target version 8.,3 Needs testing This issue needs volunteers to try to duplicate the error or identify a caues labels Nov 19, 2023
Copy link
Collaborator

@Pingout Pingout left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Received (4) script from Nikki
oc_api
oc_core
oc_leash
oc_relay

After installation, the [prefix] runaway command will bring up a menu for the Wearer
"Are you sure you want to runaway from all owners?"
and offers a Yes, No, and Disable option

For the Owner, the [prefix] runaway command will bring up a menu offering the
option to Disable

When the Owner selects the Disable button, the collar Wearer gets an Accept/Deny
option. Once accepted by the Wearer, the setting "auth=runaway~0" is in place and
a further [prefix] runaway from the Wearer results in a notice to the wearer:
"Access Denied to runaway, or the runaway settings menu"
If the collar owner uses the [prefix] runaway command again, they get a menu with
the option to Enable runaway

Conclusions: The fix works as expected. Thank you.

@Pingout Pingout removed the Needs testing This issue needs volunteers to try to duplicate the error or identify a caues label Nov 20, 2023
@Medea-Destiny
Copy link
Collaborator

Some preliminary notes:

oc_api line 725, notify owners is sent after owner list is deleted. This line should go above the LM_SETTING_DELETE lines, and it may not be a bad idea to drop in an llSleep(0.5); in case of message timing funkiness.

oc_leash line 488 triggers Unleash function on runaway_confirmed. This function provides notification of who's unleashing what, then triggers the DoUnleash function. However we also have CMD_SAFEWORD trigger DoUnleash on line 757. I don't think we need the specific unleashing text when a runaway is performed, and the runaway triggers CMD_SAFEWORD, so I don't think we need the runaway_confirmed handling in the UserCommand functioning at 488, and that saves the double call to DoUnleash.

Credits at the top of oc_leash have no detail of changes, and I think all 3 scripts could use a mention of "implemented Yosty's menu streamlining".

Will take a deeper dive soon. Thanks so much for handling this, @NikkiLacrima !

notify owners before owner list is deleted
Remove unnecessary runaway handling
credits: implemented Yosty7b3
@NikkiLacrima
Copy link
Author

Medeas comments fixed. Time to merge ?

@NikkiLacrima NikkiLacrima removed the Do Not Merge (yet) One reason or another for not merging label Nov 30, 2023
Copy link
Collaborator

@Pingout Pingout left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As a double check, I brought these three updated scripts inworld, and they all tested the same as the last time.

@SilkieSabra SilkieSabra merged commit bf0f15f into OpenCollarTeam:8.3_Features-branch Dec 2, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.3 Target version 8.,3
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants