livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-35002 - improved fix for post to Flickr b0rk. Retains underlying fix

meow-7.2.2
Beq 2025-02-03 01:49:46 +00:00
parent fc690b10fb
commit 064bb93fbf
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llfloatersnapshot.cpp
View File

@ -1478,12 +1478,14 @@ bool LLFloaterSnapshot::isWaitingState()
return (impl->getStatus() == ImplBase::STATUS_WORKING);
}
bool LLFloaterSnapshotBase::ImplBase::updatePreviewList(bool initialized)
// <FS:Beq> FIRE-35002 - Post to flickr broken, improved solution
// bool LLFloaterSnapshotBase::ImplBase::updatePreviewList(bool initialized)
bool LLFloaterSnapshotBase::ImplBase::updatePreviewList(bool initialized, bool have_flickr)
// </FS:Beq>
{
// <FS:Ansariel> Share to Flickr
//if (!initialized)
LLFloaterFlickr* floater_flickr = LLFloaterReg::findTypedInstance<LLFloaterFlickr>("flickr");
if (!initialized && !floater_flickr)
if (!initialized && !have_flickr)
// </FS:Ansariel>
return false;
@ -1502,8 +1504,11 @@ void LLFloaterSnapshotBase::ImplBase::updateLivePreview()
{
// don't update preview for hidden floater
// <FS:Beq> FIRE-35002 - Post to flickr broken
// if (mFloater && mFloater->isInVisibleChain() && ImplBase::updatePreviewList(true))
if (ImplBase::updatePreviewList(true) && mFloater)
LLFloaterFlickr* floater_flickr = LLFloaterReg::findTypedInstance<LLFloaterFlickr>("flickr");
auto have_flickr = floater_flickr != nullptr;
if ( ((mFloater && mFloater->isInVisibleChain()) ||
have_flickr) &&
ImplBase::updatePreviewList(true, have_flickr))
// </FS:Beq>
{
LL_DEBUGS() << "changed" << LL_ENDL;

2
indra/newview/llfloatersnapshot.h
View File

@ -122,7 +122,7 @@ public:
virtual EStatus getStatus() const { return mStatus; }
virtual void setNeedRefresh(bool need);
static bool updatePreviewList(bool initialized);
static bool updatePreviewList(bool initialized, bool have_flickr = false); // <FS:Beq/> FIRE-35002 - Post to flickr broken, improved solution
void setAdvanced(bool advanced) { mAdvanced = advanced; }
void setSkipReshaping(bool skip) { mSkipReshaping = skip; }