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

FIRE-24145: Fix build

master
Ansariel 2019-07-04 18:25:36 +02:00
parent 9fec9aec37
commit 9f4d33d03b
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloatersettingsdebug.cpp
View File

@ -253,7 +253,7 @@ void LLFloaterSettingsDebug::onClickSanityWarning()
{
// pass "true" to tell the sanity checker to pop up the warning, even when
// it was shown before and would be suppressed otherwise
SanityCheck::instance().onSanity(mCurrentControlVariable,true);
SanityCheck::instance().onSanity(mCurrentControlVariable, true);
}
void LLFloaterSettingsDebug::onCommitSettings()

10
indra/newview/sanitycheck.cpp
View File

@ -51,21 +51,19 @@ void SanityCheck::init()
}
// static
void SanityCheck::onSanity(LLControlVariable* controlp, BOOL disregardLastControl)
void SanityCheck::onSanity(LLControlVariable* controlp, bool disregardLastControl /*= false*/)
{
static LLControlVariable* lastControl = NULL;
static LLControlVariable* lastControl = nullptr;
if (controlp->isSane())
{
return;
}
BOOL wasIgnored = false;
if(disregardLastControl)
if (disregardLastControl)
{
// clear "ignored" status for this control, so it can actually show up
LLNotifications::instance().setIgnored(SANITY_CHECK,false);
LLNotifications::instance().setIgnored(SANITY_CHECK, false);
}
else if (controlp == lastControl)
{

2
indra/newview/sanitycheck.h
View File

@ -34,7 +34,7 @@ class SanityCheck : public LLSingleton<SanityCheck>
public:
void init();
static void onSanity(LLControlVariable* controlp, BOOL disregardLastControl = false);
static void onSanity(LLControlVariable* controlp, bool disregardLastControl = false);
static void onFixIt(const LLSD& notification, const LLSD& response, LLControlVariable* controlp);
};