summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturectrl.cpp
diff options
context:
space:
mode:
authorAnsariel <ansariel.hiller@phoenixviewer.com>2024-03-27 14:44:22 +0100
committerAndrey Lihatskiy <alihatskiy@productengine.com>2024-03-27 15:48:33 +0200
commit32c24ffbd7395be67ec6d59a00c68165ec8d8318 (patch)
tree0a2fc59de60eb0ee93355bdfbc95e022ecc3b894 /indra/newview/lltexturectrl.cpp
parent71ed19839eb95d918329b2c776c8af3b8724f1da (diff)
Fix merge issues
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
-rw-r--r--indra/newview/lltexturectrl.cpp2
1 files changed, 1 insertions, 1 deletions
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);
}
}