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

MAINT-6604 FIXED [VOB] Snapshot preview is corrupted

meow-7.2.2
Mnikolenko Productengine 2016-08-04 17:27:48 +03:00
parent 84677aad4c
commit cc7dda96e7
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfloateroutfitsnapshot.cpp
View File

@ -1,5 +1,5 @@
/**
* @file llfloatersnapshot.cpp
* @file llfloateroutfitsnapshot.cpp
* @brief Snapshot preview window for saving as an outfit thumbnail in visual outfit gallery
*
* $LicenseInfo:firstyear=2004&license=viewerlgpl$
@ -256,7 +256,7 @@ BOOL LLFloaterOutfitSnapshot::postBuild()
}
childSetCommitCallback("filters_combobox", ImplBase::onClickFilter, this);
sThumbnailPlaceholder = getChild<LLUICtrl>("thumbnail_placeholder");
mThumbnailPlaceholder = getChild<LLUICtrl>("thumbnail_placeholder");
// create preview window
LLRect full_screen_rect = getRootView()->getRect();

2
indra/newview/llfloateroutfitsnapshot.h
View File

@ -53,7 +53,7 @@ public:
static LLFloaterOutfitSnapshot* getInstance();
/*virtual*/ void saveTexture();
static const LLRect& getThumbnailPlaceholderRect() { return sThumbnailPlaceholder->getRect(); }
const LLRect& getThumbnailPlaceholderRect() { return mThumbnailPlaceholder->getRect(); }
void setOutfitID(LLUUID id) { mOutfitID = id; }
LLUUID getOutfitID() { return mOutfitID; }

7
indra/newview/llfloatersnapshot.cpp
View File

@ -50,7 +50,6 @@
///----------------------------------------------------------------------------
/// Local function declarations, constants, enums, and typedefs
///----------------------------------------------------------------------------
LLUICtrl* LLFloaterSnapshotBase::sThumbnailPlaceholder = NULL;
LLSnapshotFloaterView* gSnapshotFloaterView = NULL;
const F32 AUTO_SNAPSHOT_TIME_DELAY = 1.f;
@ -1011,7 +1010,7 @@ BOOL LLFloaterSnapshot::postBuild()
LLWebProfile::setImageUploadResultCallback(boost::bind(&Impl::onSnapshotUploadFinished, this, _1));
LLPostCard::setPostResultCallback(boost::bind(&Impl::onSendingPostcardFinished, this, _1));
sThumbnailPlaceholder = getChild<LLUICtrl>("thumbnail_placeholder");
mThumbnailPlaceholder = getChild<LLUICtrl>("thumbnail_placeholder");
// create preview window
LLRect full_screen_rect = getRootView()->getRect();
@ -1060,7 +1059,7 @@ void LLFloaterSnapshotBase::draw()
LLFloater::draw();
if (previewp && !isMinimized() && sThumbnailPlaceholder->getVisible())
if (previewp && !isMinimized() && mThumbnailPlaceholder->getVisible())
{
if(previewp->getThumbnailImage())
{
@ -1089,7 +1088,7 @@ void LLFloaterSnapshotBase::draw()
gGL.pushUIMatrix();
LLUI::translate((F32) thumbnail_rect.mLeft, (F32) thumbnail_rect.mBottom);
sThumbnailPlaceholder->draw();
mThumbnailPlaceholder->draw();
gGL.popUIMatrix();
}
}

4
indra/newview/llfloatersnapshot.h
View File

@ -56,7 +56,7 @@ public:
LLSnapshotLivePreview* getPreviewView();
const LLVector3d& getPosTakenGlobal();
static const LLRect& getThumbnailPlaceholderRect() { return sThumbnailPlaceholder->getRect(); }
const LLRect& getThumbnailPlaceholderRect() { return mThumbnailPlaceholder->getRect(); }
void setRefreshLabelVisible(bool value) { mRefreshLabel->setVisible(value); }
void setSuccessLabelPanelVisible(bool value) { mSucceessLblPanel->setVisible(value); }
@ -67,7 +67,7 @@ public:
ImplBase* impl;
protected:
static LLUICtrl* sThumbnailPlaceholder;
LLUICtrl* mThumbnailPlaceholder;
LLUICtrl *mRefreshBtn, *mRefreshLabel;
LLUICtrl *mSucceessLblPanel, *mFailureLblPanel;
};