From a751256f27349e249ade5be81c7a88f1ad1c1ca9 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 4 Feb 2014 14:28:48 +0100 Subject: [PATCH] Really send only one last packet instead of two... --- indra/newview/llappviewer.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 3726226246..07efe58947 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4369,10 +4369,12 @@ void LLAppViewer::requestQuit() } // Try to send last batch of avatar rez metrics. - if (!gDisconnected && isAgentAvatarValid()) - { - gAgentAvatarp->updateAvatarRezMetrics(true); // force a last packet to be sent. - } + // LL merge error + //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());