Skip to content

update message_template.msg to agree with master #1684

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

Merged
merged 1 commit into from
Nov 20, 2024

Conversation

AndrewMeadows
Copy link
Contributor

The master-message-template repo hasn't been updated since 2017... until today. A PR has just been created to update that with a cleaned up copy of what is being used by the server develop branch. This PR aims to provide the same cleaned up version. No messages should have changed, only whitespace (a lot of it) and a few comments.

@AndrewMeadows AndrewMeadows changed the title update message_template.ms to agree with master update message_template.msg to agree with master Jun 10, 2024
@SaladDais
Copy link
Contributor

FYI this does change messages, but only to add blocks / new messages, that should be safe. no-whitespace diff view is probably best for this: https://github.com/secondlife/viewer/pull/1684/files?diff=unified&w=1.

Also, this should probably use develop as the merge target now.

@AndrewMeadows
Copy link
Contributor Author

Now that the GameControl message is in both server and viewer codebases this PR has been updated. It is ready to go.

BTW, it introduces the Combat message template changes to develop early, but that should be ok.

@AndrewMeadows AndrewMeadows force-pushed the leviathan/update-message-template branch from 0a464b8 to 3ab971a Compare November 18, 2024 22:23
@AndrewMeadows AndrewMeadows force-pushed the leviathan/update-message-template branch from 3ab971a to aee3624 Compare November 19, 2024 01:05
@AndrewMeadows AndrewMeadows merged commit 5590735 into develop Nov 20, 2024
14 checks passed
@AndrewMeadows AndrewMeadows deleted the leviathan/update-message-template branch November 20, 2024 20:34
@github-actions github-actions bot locked and limited conversation to collaborators Nov 20, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants