diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-06-11 06:56:31 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-11 06:56:31 +0300 |
| commit | e6a34dad9594f3ae88736ca55cfada3d5f8e1819 (patch) | |
| tree | d5b498f2a73eb6709b5c24241549f854a14b7bb6 /indra/newview/llagentcamera.cpp | |
| parent | 8f6e50ed6a8b2a3f7b2a173bf7c535aac13f22b5 (diff) | |
| parent | ee49b3b045e366aec466f46743214386d7fecb21 (diff) | |
Merge pull request #1689 from secondlife/marchcat/c-merge
Release (Materials featurette) -> Maint C sync
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
| -rw-r--r-- | indra/newview/llagentcamera.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 282b41b2f1..1912d9d1d5 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -2526,7 +2526,7 @@ void LLAgentCamera::setFocusGlobal(const LLPickInfo& pick) { LLViewerObject* objectp = gObjectList.findObject(pick.mObjectID); - if (objectp) + if (objectp && pick.mGLTFNodeIndex == -1) { // focus on object plus designated offset // which may or may not be same as pick.mPosGlobal |