From 32c24ffbd7395be67ec6d59a00c68165ec8d8318 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 27 Mar 2024 14:44:22 +0100
Subject: Fix merge issues

---
 indra/newview/lltexturectrl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/lltexturectrl.cpp')

diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index c70121364c..34bd8412f5 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -1530,7 +1530,7 @@ void LLFloaterTexturePicker::setInventoryPickType(EPickInventoryType type)
     // refresh selection
     if (!mImageAssetID.isNull() || mInventoryPickType == PICK_MATERIAL)
     {
-        mInventoryPanel->setSelection(findItemID(mImageAssetID, FALSE), TAKE_FOCUS_NO);
+        mInventoryPanel->setSelection(findItemID(mImageAssetID, false), TAKE_FOCUS_NO);
     }
 }
 
-- 
cgit v1.2.3