Hey everyone!
Just have a quick update on our current branches.
The state of develop has gotten unwieldy over the past year due to a mix of quality controls being skipped, and previous viewer lead times resulting in many things going unreleased for long periods of time. As a result, we are going to be migrating changes from the past year of develop PRs into a new default branch in the viewer repository. This includes OSS changes. We are currently reviewing the list of PRs that we need to consider. Develop has gotten to a state where trying to release it at this stage would be very difficult without much more time than we have to iron out its problems.
I know this will create some frustration, but due to a lack of testing of many things, both by their original contributors and our limited QA resources, that made it into develop, this is the most viable path forward that we've been able to determine without spending several months of effort to try and get things into a shippable state in the develop branch. As a result, we will be re-evaluating our pull request policies moving forward to ensure that changes that make it into develop are in a more shippable state. More details around the preferred branching flow, and our criteria for merging into develop, will be coming soon.
The result of all of this will be changes will get out sooner! However, not all changes will go out at once. Further details on help we'd like in this process will be coming soon as well, including what branches to target moving forward. Any active PRs should remain targeted at their current branches (such as archive/develop for old develop PRs - which have been automatically targeted at the correct branch).
A new "clean" develop branch has been established in the develop branch which can be found here:
https://github.com/secondlife/viewer/tree/develop. Right now this is just a clone of main, but expect this to have ForeverFPS soon. We will be backporting items from develop into it with time. main will continue to be whatever our current shipping release is. The old version of develop that we're currently building a list of things to backport from can be found here:
https://github.com/secondlife/viewer/tree/archive/developIn other branch and release news, we've branched our upcoming release 2025.03, which presently contains ForeverFPS and whatever high risk changes that are not ready for ForeverFPS. We're currently looking at getting maint-b merged in from a clean archive branch we have elsewhere. maint-b contains some of the Linux changes that have been contributed upstream to us. Some of these Linux changes may be reverted based upon priority and viability to ship in our upcoming 2025.03 release.
Thank you everyone for understanding the current develop situation. We look forward to collaborating with all of you on bringing develop PRs back into the fold, and refining our contributor process and policies.