diff options
| author | Ansariel <ansariel.hiller@phoenixviewer.com> | 2024-05-10 15:16:06 +0200 | 
|---|---|---|
| committer | Ansariel <ansariel.hiller@phoenixviewer.com> | 2024-05-10 15:16:06 +0200 | 
| commit | 799ebf21624edb8b42ca16b8cf51c138643efd32 (patch) | |
| tree | 438df7d344821c75c65625353198542103b18f9f /indra/newview/llselectmgr.cpp | |
| parent | 155ddf23363f1d5c534c69f50505faf67e51948f (diff) | |
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);      }  | 
