Repository navigation
#6532 fix cam FOCUS_LAG being unnecessarily clamped in some situations - #6533
Merged
akleshchev merged 2 commits intoOct 28, 2026
Merged
Conversation
akleshchev
approved these changes
Oct 27, 2026
akleshchev
left a comment
akleshchev
left a comment
Contributor
There was a problem hiding this comment.
Can confirm that it works, thank you.
Contributor
There was a problem hiding this comment.
🟡 Changes recommended
The camera can remain stuck at the 50 m limit despite zooming in, allowing further scrolling to enter mouselook without moving it closer and reintroducing the stuck-zoom behavior from #6249.
1 open issue
What changed in this PR
Adjusts follow-camera distance enforcement to address #6532, allowing scripted camera lag beyond the requested follow distance while retaining the viewer’s maximum distance limit.
Changes:
- Uses the viewer’s maximum distance for both the clamp condition and camera-position scaling.
- Updates comments to explain why movement-induced position lag may exceed the requested distance.
| File | Description |
|---|---|
indra/newview/llfollowcam.cpp |
Adjusts the follow-camera distance clamp and documents the intended lag behavior. |
Review effort: Balanced
Contributor
|
Please, rebase to release/26.5 |
trish-sl
force-pushed
the
fix-cameraregression
branch
from
October 27, 2026 22:44
43ae9a0 to
70f781b
Compare
github-actions
Bot
added
cmake
python
llwindow
llcommon
llcorehttp
llfilesystem
llmath
llmessage
llui
llxml
objc
labels
trish-sl
force-pushed
the
fix-cameraregression
branch
from
October 27, 2026 22:45
70f781b to
2f663c6
Compare
akleshchev
self-requested a review
October 28, 2026 15:13
akleshchev
approved these changes
Oct 28, 2026
akleshchev
force-pushed
the
fix-cameraregression
branch
from
October 28, 2026 15:14
2f663c6 to
085aad0
Compare
akleshchev
enabled auto-merge (squash)
October 28, 2026 15:15
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
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.
Fixes #6532 , a regression coming to the zoom fix in in #6249. The max distance should only be clamped by mMaxCameraDistantFromSubject rather than the requested max distance, otherwise camera focus lag gets pushed closer than intended.
Verified that both the original issue and the #6532 regressions are covered by this fix