diff options
| author | Anchor <none@none> | 2018-11-28 15:16:01 -0800 |
|---|---|---|
| committer | Anchor <none@none> | 2018-11-28 15:16:01 -0800 |
| commit | 014480a79b765587881d0c0f707a7ee191f5fe2e (patch) | |
| tree | 4d759c7b996065cccb9171a51a1a3f05d04b6e31 /indra/newview/llappviewer.cpp | |
| parent | 076719013ec2dab7bf8fd1f4d1f953ab73d594e9 (diff) | |
| parent | 8558ce5c600b810356010ba3cd6d534ef22f4081 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 189f7c1426..4374caacdf 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1086,7 +1086,7 @@ 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()) + if (gSavedSettings.getString("CmdLineLoginLocation").empty() && !beingDebugged()) { const char* PARENT = getenv("PARENT"); if (! (PARENT && std::string(PARENT) == "SL_Launcher")) @@ -3918,12 +3918,6 @@ void LLAppViewer::requestQuit() gAgentAvatarp->updateAvatarRezMetrics(true); // force a last packet to be sent. } - // Try to send last batch of avatar rez metrics. - if (!gDisconnected && isAgentAvatarValid()) - { - gAgentAvatarp->updateAvatarRezMetrics(true); // force a last packet to be sent. - } - LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral*)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE); effectp->setPositionGlobal(gAgent.getPositionGlobal()); effectp->setColor(LLColor4U(gAgent.getEffectColor())); |