diff options
author | Dave Parks <davep@lindenlab.com> | 2024-05-14 14:24:21 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-14 14:24:21 -0500 |
commit | 7bfb29687c2e621d3aae9e2794a57dc0168fdf1d (patch) | |
tree | 50b128638c6ce451234ac71c734c3376ea1d6046 /indra/newview/llselectmgr.cpp | |
parent | 193d9d5f767c2bfad1dc5ced4fa630d05ae798ae (diff) | |
parent | d21f29b6439db5b954d630a4461fe77365cdb4b3 (diff) |
Merge pull request #1446 from Ansariel/project/gltf_development
Fix broken merge and BOOL/bool issues
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
-rw-r--r-- | indra/newview/llselectmgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 546dd0c6b2..a885e6b45e 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -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, TRUE, gltf_node, gltf_primitive); + addAsIndividual(object, face, true, gltf_node, gltf_primitive); // Stop the object from moving (this anticipates changes on the // simulator in LLTask::userSelect) @@ -1083,7 +1083,7 @@ void LLSelectMgr::addAsIndividual(LLViewerObject *objectp, S32 face, bool undoab // Handle glTF node selection if (gltf_node >= 0) { - nodep->selectGLTFNode(gltf_node, gltf_primitive, TRUE); + nodep->selectGLTFNode(gltf_node, gltf_primitive, true); } |