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

MAINT-6616 new crash in VOB viewer in snapshot preview

master
Mnikolenko Productengine 2016-08-10 16:32:35 +03:00
parent 471ff40c2c
commit b496e4ff15
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llfloateroutfitsnapshot.cpp
View File

@ -311,13 +311,20 @@ void LLFloaterOutfitSnapshot::onOpen(const LLSD& key)
// static
void LLFloaterOutfitSnapshot::update()
{
LLFloaterOutfitSnapshot* inst = getInstance();
LLFloaterOutfitSnapshot* inst = findInstance();
if (inst != NULL)
{
inst->impl->updateLivePreview();
}
}
// static
LLFloaterOutfitSnapshot* LLFloaterOutfitSnapshot::findInstance()
{
return LLFloaterReg::findTypedInstance<LLFloaterOutfitSnapshot>("outfit_snapshot");
}
// static
LLFloaterOutfitSnapshot* LLFloaterOutfitSnapshot::getInstance()
{

1
indra/newview/llfloateroutfitsnapshot.h
View File

@ -51,6 +51,7 @@ public:
static void update();
static LLFloaterOutfitSnapshot* getInstance();
static LLFloaterOutfitSnapshot* findInstance();
/*virtual*/ void saveTexture();
const LLRect& getThumbnailPlaceholderRect() { return mThumbnailPlaceholder->getRect(); }

8
indra/newview/llfloatersnapshot.cpp
View File

@ -1255,13 +1255,19 @@ void LLFloaterSnapshotBase::ImplBase::updateLivePreview()
//static
void LLFloaterSnapshot::update()
{
LLFloaterSnapshot* inst = getInstance();
LLFloaterSnapshot* inst = findInstance();
if (inst != NULL)
{
inst->impl->updateLivePreview();
}
}
// static
LLFloaterSnapshot* LLFloaterSnapshot::findInstance()
{
return LLFloaterReg::findTypedInstance<LLFloaterSnapshot>("snapshot");
}
// static
LLFloaterSnapshot* LLFloaterSnapshot::getInstance()
{

1
indra/newview/llfloatersnapshot.h
View File

@ -146,6 +146,7 @@ public:
static void update();
static LLFloaterSnapshot* getInstance();
static LLFloaterSnapshot* findInstance();
/*virtual*/ void saveTexture();
BOOL saveLocal();
static void setAgentEmail(const std::string& email);