From b0d773bc181a4b885d0732ee2393b4473f90689e Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Mon, 21 Jul 2014 10:53:01 +0300 Subject: MAINT-4254 FIXED Don't change selection in Inventory panel when image's uuid is null. --- indra/newview/lltexturectrl.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index c12753acb0..b9eb68556d 100755 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -240,7 +240,7 @@ void LLFloaterTexturePicker::setImageID(const LLUUID& image_id) mViewModel->setDirty(); // *TODO: shouldn't we be using setValue() here? mImageAssetID = image_id; LLUUID item_id = findItemID(mImageAssetID, FALSE); - if (item_id.isNull()) + if (image_id.isNull()) { mInventoryPanel->getRootFolder()->clearSelection(); } @@ -461,7 +461,10 @@ BOOL LLFloaterTexturePicker::postBuild() // don't put keyboard focus on selected item, because the selection callback // will assume that this was user input - mInventoryPanel->setSelection(findItemID(mImageAssetID, FALSE), TAKE_FOCUS_NO); + if(!mImageAssetID.isNull()) + { + mInventoryPanel->setSelection(findItemID(mImageAssetID, FALSE), TAKE_FOCUS_NO); + } } mModeSelector = getChild("mode_selection"); -- cgit v1.2.3