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

DRTVWR-474: Remove nag about SL_Launcher.

meow-7.2.2
Nat Goodspeed 2018-09-11 19:57:42 -04:00
parent 517e1605e9
commit e3d16dcb70
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/llappviewer.cpp
View File

@ -1083,26 +1083,6 @@ bool LLAppViewer::init()
}
}
// don't nag developers who need to run the executable directly
#if LL_RELEASE_FOR_DOWNLOAD
// MAINT-8305: If we're processing a SLURL, skip the launcher check.
if (gSavedSettings.getString("CmdLineLoginLocation").empty())
{
const char* PARENT = getenv("PARENT");
if (! (PARENT && std::string(PARENT) == "SL_Launcher"))
{
// Don't directly run this executable. Please run the launcher, which
// will run the viewer itself.
// Naturally we do not consider this bulletproof. The point is to
// gently remind a user who *inadvertently* finds him/herself in this
// situation to do things the Right Way. Anyone who intentionally
// bypasses this mechanism needs no reminder that s/he's shooting
// him/herself in the foot.
LLNotificationsUtil::add("RunLauncher");
}
}
#endif
#if LL_WINDOWS
if (gGLManager.mGLVersion < LLFeatureManager::getInstance()->getExpectedGLVersion())
{