admin/phoenix-firestorm
1
0
Fork 0
mirror of https://github.com/FirestormViewer/phoenix-firestorm.git synced 2026-08-14 08:53:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix inconsistent texture picker preview mode

Browse Source
This commit is contained in:
Ansariel
2026-05-20 12:44:05 +02:00
parent d141b9045c
commit 26d78e0d9f
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
indra/newview/lltexturectrl.cpp
+2 -6
View File
@@ -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