diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-06-10 17:24:19 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-06-10 17:24:19 -0400 |
| commit | 730d94779c0e798ec91b269b530a08f0eebaa13d (patch) | |
| tree | d4821d194caef6e71f3e31b578fde635a38bdb3b /indra/newview/llmanip.cpp | |
| parent | d317454c82e016a02c8a708a0118f3ff29aa8e82 (diff) | |
| parent | 9f97ff7286aceef5be4e7589ca4af911edf30f12 (diff) | |
Merge release/materials_featurette to main on promotion of secondlife/viewer #648: Release/materials featurette
Diffstat (limited to 'indra/newview/llmanip.cpp')
| -rw-r--r-- | indra/newview/llmanip.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llmanip.cpp b/indra/newview/llmanip.cpp index 3f03469db9..f43613be9f 100644 --- a/indra/newview/llmanip.cpp +++ b/indra/newview/llmanip.cpp @@ -355,8 +355,14 @@ LLVector3 LLManip::getSavedPivotPoint() const LLVector3 LLManip::getPivotPoint() { - if (mObjectSelection->getFirstObject() && mObjectSelection->getObjectCount() == 1 && mObjectSelection->getSelectType() != SELECT_TYPE_HUD) + LLViewerObject* object = mObjectSelection->getFirstObject(); + if (object && mObjectSelection->getObjectCount() == 1 && mObjectSelection->getSelectType() != SELECT_TYPE_HUD) { + LLSelectNode* select_node = mObjectSelection->getFirstNode(); + if (select_node->mSelectedGLTFNode != -1) + { + return object->getGLTFNodePositionAgent(select_node->mSelectedGLTFNode); + } return mObjectSelection->getFirstObject()->getPivotPositionAgent(); } return LLSelectMgr::getInstance()->getBBoxOfSelection().getCenterAgent(); |