Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A

# Conflicts:
#	indra/llappearance/llavatarappearance.h
#	indra/llimage/llimage.cpp
#	indra/llmath/llvolume.cpp
#	indra/llmath/llvolume.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llrendertarget.cpp
#	indra/llrender/llshadermgr.cpp
#	indra/newview/lldynamictexture.cpp
#	indra/newview/llenvironment.cpp
#	indra/newview/llfetchedgltfmaterial.cpp
#	indra/newview/llfloaterimagepreview.cpp
#	indra/newview/llfloaterimagepreview.h
#	indra/newview/llfloaterregioninfo.cpp
#	indra/newview/llfloaterregioninfo.h
#	indra/newview/llmaniprotate.cpp
#	indra/newview/llmaniptranslate.cpp
#	indra/newview/llpanelvolume.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/llselectmgr.h
#	indra/newview/llsurface.cpp
#	indra/newview/llsurface.h
#	indra/newview/llsurfacepatch.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/lltinygltfhelper.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llviewerwindow.h
#	indra/newview/llvlcomposition.cpp
#	indra/newview/llvlcomposition.h
#	indra/newview/llvocache.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/pipeline.cpp

1 files changed, 62 insertions, 34 deletions

diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 66f2e65274..b3420f9c57 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -456,7 +456,7 @@ void LLSelectMgr::overrideAvatarUpdates()
 //-----------------------------------------------------------------------------
 // Select just the object, not any other group members.
 //-----------------------------------------------------------------------------
-LLObjectSelectionHandle LLSelectMgr::selectObjectOnly(LLViewerObject* object, S32 face)
+LLObjectSelectionHandle LLSelectMgr::selectObjectOnly(LLViewerObject* object, S32 face, S32 gltf_node, S32 gltf_primitive)
 {
     llassert( object );
 
@@ -481,7 +481,7 @@ LLObjectSelectionHandle LLSelectMgr::selectObjectOnly(LLViewerObject* object, S3
 
     // Place it in the list and tag it.
     // This will refresh dialogs.
-    addAsIndividual(object, face);
+    addAsIndividual(object, face, true, gltf_node, gltf_primitive);
 
     // Stop the object from moving (this anticipates changes on the
     // simulator in LLTask::userSelect)
@@ -1033,7 +1033,7 @@ void LLSelectMgr::addAsFamily(std::vector<LLViewerObject*>& objects, bool add_to
 //-----------------------------------------------------------------------------
 // addAsIndividual() - a single object, face, etc
 //-----------------------------------------------------------------------------
-void LLSelectMgr::addAsIndividual(LLViewerObject *objectp, S32 face, bool undoable)
+void LLSelectMgr::addAsIndividual(LLViewerObject *objectp, S32 face, bool undoable, S32 gltf_node, S32 gltf_primitive)
 {
     // check to see if object is already in list
     LLSelectNode *nodep = mSelectedObjects->findNode(objectp);
@@ -1080,6 +1080,13 @@ void LLSelectMgr::addAsIndividual(LLViewerObject *objectp, S32 face, bool undoab
         return;
     }
 
+    // Handle glTF node selection
+    if (gltf_node >= 0)
+    {
+        nodep->selectGLTFNode(gltf_node, gltf_primitive, true);
+
+    }
+
     saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
     updateSelectionCenter();
     dialog_refresh_all();
@@ -1782,7 +1789,7 @@ bool LLObjectSelection::applyRestrictedPbrMaterialToTEs(LLViewerInventoryItem* i
     LLUUID asset_id = item->getAssetUUID();
     if (asset_id.isNull())
     {
-        asset_id = LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID;
+        asset_id = BLANK_MATERIAL_ASSET_ID;
     }
 
     bool material_copied_all_faces = true;
@@ -1987,7 +1994,7 @@ bool LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id)
                 asset_id = mItem->getAssetUUID();
                 if (asset_id.isNull())
                 {
-                    asset_id = LLGLTFMaterialList::BLANK_MATERIAL_ASSET_ID;
+                    asset_id = BLANK_MATERIAL_ASSET_ID;
                 }
             }
 
@@ -5213,46 +5220,57 @@ void LLSelectMgr::saveSelectedObjectTransform(EActionType action_type)
             {
                 return true; // skip
             }
-            selectNode->mSavedPositionLocal = object->getPosition();
-            if (object->isAttachment())
+
+            if (selectNode->mSelectedGLTFNode != -1)
             {
-                if (object->isRootEdit())
+                // save GLTF node state
+                object->getGLTFNodeTransformAgent(selectNode->mSelectedGLTFNode, &selectNode->mSavedPositionLocal, &selectNode->mSavedRotation, &selectNode->mSavedScale);
+                selectNode->mSavedPositionGlobal = gAgent.getPosGlobalFromAgent(selectNode->mSavedPositionLocal);
+                selectNode->mLastMoveLocal.setZero();
+            }
+            else
+            {
+                selectNode->mSavedPositionLocal = object->getPosition();
+                if (object->isAttachment())
                 {
-                    LLXform* parent_xform = object->mDrawable->getXform()->getParent();
-                    if (parent_xform)
+                    if (object->isRootEdit())
                     {
-                        selectNode->mSavedPositionGlobal = gAgent.getPosGlobalFromAgent((object->getPosition() * parent_xform->getWorldRotation()) + parent_xform->getWorldPosition());
+                        LLXform* parent_xform = object->mDrawable->getXform()->getParent();
+                        if (parent_xform)
+                        {
+                            selectNode->mSavedPositionGlobal = gAgent.getPosGlobalFromAgent((object->getPosition() * parent_xform->getWorldRotation()) + parent_xform->getWorldPosition());
+                        }
+                        else
+                        {
+                            selectNode->mSavedPositionGlobal = object->getPositionGlobal();
+                        }
                     }
                     else
                     {
-                        selectNode->mSavedPositionGlobal = object->getPositionGlobal();
+                        LLViewerObject* attachment_root = (LLViewerObject*)object->getParent();
+                        LLXform* parent_xform = attachment_root ? attachment_root->mDrawable->getXform()->getParent() : NULL;
+                        if (parent_xform)
+                        {
+                            LLVector3 root_pos = (attachment_root->getPosition() * parent_xform->getWorldRotation()) + parent_xform->getWorldPosition();
+                            LLQuaternion root_rot = (attachment_root->getRotation() * parent_xform->getWorldRotation());
+                            selectNode->mSavedPositionGlobal = gAgent.getPosGlobalFromAgent((object->getPosition() * root_rot) + root_pos);
+                        }
+                        else
+                        {
+                            selectNode->mSavedPositionGlobal = object->getPositionGlobal();
+                        }
                     }
+                    selectNode->mSavedRotation = object->getRenderRotation();
                 }
                 else
                 {
-                    LLViewerObject* attachment_root = (LLViewerObject*)object->getParent();
-                    LLXform* parent_xform = attachment_root ? attachment_root->mDrawable->getXform()->getParent() : NULL;
-                    if (parent_xform)
-                    {
-                        LLVector3 root_pos = (attachment_root->getPosition() * parent_xform->getWorldRotation()) + parent_xform->getWorldPosition();
-                        LLQuaternion root_rot = (attachment_root->getRotation() * parent_xform->getWorldRotation());
-                        selectNode->mSavedPositionGlobal = gAgent.getPosGlobalFromAgent((object->getPosition() * root_rot) + root_pos);
-                    }
-                    else
-                    {
-                        selectNode->mSavedPositionGlobal = object->getPositionGlobal();
-                    }
+                    selectNode->mSavedPositionGlobal = object->getPositionGlobal();
+                    selectNode->mSavedRotation = object->getRotationRegion();
                 }
-                selectNode->mSavedRotation = object->getRenderRotation();
-            }
-            else
-            {
-                selectNode->mSavedPositionGlobal = object->getPositionGlobal();
-                selectNode->mSavedRotation = object->getRotationRegion();
-            }
 
-            selectNode->mSavedScale = object->getScale();
-            selectNode->saveTextureScaleRatios(mManager->mTextureChannel);
+                selectNode->mSavedScale = object->getScale();
+                selectNode->saveTextureScaleRatios(mManager->mTextureChannel);
+            }
             return true;
         }
     } func(action_type, this);
@@ -6684,7 +6702,6 @@ LLSelectNode::~LLSelectNode()
         }
     }
 
-
     delete mPermissions;
     mPermissions = NULL;
 }
@@ -6713,6 +6730,17 @@ void LLSelectNode::selectTE(S32 te_index, bool selected)
     mLastTESelected = te_index;
 }
 
+void LLSelectNode::selectGLTFNode(S32 node_index, S32 primitive_index, bool selected)
+{
+    if (node_index < 0)
+    {
+        return;
+    }
+
+    mSelectedGLTFNode = node_index;
+    mSelectedGLTFPrimitive = primitive_index;
+}
+
 bool LLSelectNode::isTESelected(S32 te_index) const
 {
     if (te_index < 0 || te_index >= mObject->getNumTEs())