Merge branch 'main' into release/2025.03 #3707
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2024.12 ForeverFPS
marchcat
approved these changes
Mar 10, 2025
akleshchev
reviewed
Mar 11, 2025
| bool is_local(false); | ||
| LLViewerRegion* regionp = getRegion(); | ||
|
|
||
| if (LLLandmark* landmark = gLandmarkList.getAsset(landmark_asset_id, NULL)) |
There was a problem hiding this comment.
I think this needs to check region, this is using regionp->getHandle() insde.
akleshchev
approved these changes
Mar 11, 2025
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
2 changesets from FFPS didn't get to 2025.03