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

VS build fix: missed values

master
Andrey Lihatskiy 2024-02-12 23:17:03 +02:00
parent 1839def9dc
commit 2d8654db9c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llappearance/llavatarappearance.cpp
View File

@ -1924,7 +1924,7 @@ bool LLAvatarAppearance::LLAvatarXmlInfo::parseXmlMeshNodes(LLXmlTreeNode* root)
{
delete morphinfo;
delete info;
return -1;
return false;
}
BOOL shared = false;
static LLStdStringHandle shared_string = LLXmlTree::addAttributeString("shared");

10
indra/newview/llfloateruipreview.cpp
View File

@ -243,7 +243,7 @@ public:
virtual ~LLGUIPreviewLiveFile();
LLFloaterUIPreview* mParent;
LLFadeEventTimer* mFadeTimer; // timer for fade-to-yellow-and-back effect to warn that file has been reloaded
BOOL mFirstFade; // setting this avoids showing the fade reload warning on first load
bool mFirstFade; // setting this avoids showing the fade reload warning on first load
std::string mFileName;
protected:
bool loadFile();
@ -257,7 +257,7 @@ public:
bool tick();
LLGUIPreviewLiveFile* mParent;
private:
BOOL mFadingOut; // fades in then out; this is toggled in between
bool mFadingOut; // fades in then out; this is toggled in between
LLColor4 mOriginalColor; // original color; color is reset to this after fade is coimplete
};
@ -311,7 +311,7 @@ LLLocalizationResetForcer::~LLLocalizationResetForcer()
LLGUIPreviewLiveFile::LLGUIPreviewLiveFile(std::string path, std::string name, LLFloaterUIPreview* parent)
: mFileName(name),
mParent(parent),
mFirstFade(TRUE),
mFirstFade(true),
mFadeTimer(NULL),
LLLiveFile(path, 1.0)
{}
@ -332,7 +332,7 @@ bool LLGUIPreviewLiveFile::loadFile()
mParent->displayFloater(FALSE,1); // redisplay the floater
if(mFirstFade) // only fade if it wasn't just clicked on; can't use "clicked" BOOL below because of an oddity with setting LLLiveFile initial state
{
mFirstFade = FALSE;
mFirstFade = false;
}
else
{
@ -348,7 +348,7 @@ bool LLGUIPreviewLiveFile::loadFile()
// Initialize fade event timer
LLFadeEventTimer::LLFadeEventTimer(F32 refresh, LLGUIPreviewLiveFile* parent)
: mParent(parent),
mFadingOut(TRUE),
mFadingOut(true),
LLEventTimer(refresh)
{
mOriginalColor = mParent->mParent->mDisplayedFloater->getBackgroundColor();