From 26d78e0d9f5f0ce8430fa38005faf5dbed578c8d Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 20 May 2026 12:44:05 +0200
Subject: [PATCH] Fix inconsistent texture picker preview mode

---
 indra/newview/lltexturectrl.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 1c9f48f7de..a9d06043e8 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -2354,6 +2354,7 @@ void LLTextureCtrl::setImageAssetID( const LLUUID& asset_id )
         mImageItemID.setNull();
         mImageAssetID = asset_id;
         mLocalTrackingID.setNull();
+        LLView::setEnabled(!mOpenTexPreview || (asset_id.notNull() && !mIsPreviewDisabled)); // <FS:Ansariel> Texture preview mode
         LLFloaterTexturePicker* floaterp = (LLFloaterTexturePicker*)mFloaterHandle.get();
         if( floaterp && getEnabled() )
         {
@@ -2705,12 +2706,7 @@ bool LLTextureCtrl::handleUnicodeCharHere(llwchar uni_char)
 
 void LLTextureCtrl::setValue( const LLSD& value )
 {
-    // <FS:Ansariel> Texture preview mode
-    //setImageAssetID(value.asUUID());
-    LLUUID uuid = value.asUUID();
-    setImageAssetID(uuid);
-    LLView::setEnabled(!mOpenTexPreview || (uuid.notNull() && !mIsPreviewDisabled));
-    // </FS:Ansariel>
+    setImageAssetID(value.asUUID());
 }
 
 LLSD LLTextureCtrl::getValue() const