diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 61e279c01..294dfb319 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -8257,6 +8257,17 @@ This should be as low as possible, but too low may break functionality Value 0.0 + InventoryDebugSimulateLateOpRate + + Comment + Rate at which we simulate late-completing copy/link requests in some operations + Persist + 1 + Type + F32 + Value + 0.0 + InventoryDisplayInbox Comment @@ -10761,6 +10772,17 @@ This should be as low as possible, but too low may break functionality Value 0 + QAModeMetrics + + Comment + "Enables QA features (logging, faster cycling) for metrics collector" + Persist + 1 + Type + Boolean + Value + 0 + QuietSnapshotsToDisk Comment diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 39c580f50..d83ccac39 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3156,7 +3156,7 @@ 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. + LLVOAvatarSelf::updateAvatarRezMetrics(true); // force a last packet to be sent. } LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral*)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE); diff --git a/indra/newview/llmanip.cpp b/indra/newview/llmanip.cpp index e7cdc51cc..44ab0f9bc 100644 --- a/indra/newview/llmanip.cpp +++ b/indra/newview/llmanip.cpp @@ -603,9 +603,9 @@ void LLManip::renderTickValue(const LLVector3& pos, F32 value, const std::string LLColor4 LLManip::setupSnapGuideRenderPass(S32 pass) { - static const LLCachedControl grid_color_fg("GridlineColor",LLColor4(1.f,1.f,1.f,.8f)); - static const LLCachedControl grid_color_bg("GridlineBGColor",LLColor4(.9f,.9f,1.f,.8f)); - static const LLCachedControl grid_color_shadow("GridlineShadowColor",LLColor4(0.f,0.f,0.f,.3f)); + static const LLCachedControl grid_color_fg(gColors,"GridlineColor",LLColor4(1.f,1.f,1.f,.8f)); + static const LLCachedControl grid_color_bg(gColors,"GridlineBGColor",LLColor4(.9f,.9f,1.f,.8f)); + static const LLCachedControl grid_color_shadow(gColors,"GridlineShadowColor",LLColor4(0.f,0.f,0.f,.3f)); LLColor4 line_color; static const LLCachedControl line_alpha("GridOpacity",1.f); diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 8ab29f500..a4ab27f8a 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -228,7 +228,7 @@ void LLVOAvatarSelf::initInstance() } //doPeriodically(output_self_av_texture_diagnostics, 30.0); - doPeriodically(boost::bind(&LLVOAvatarSelf::updateAvatarRezMetrics, this, false), 5.0); + doPeriodically(boost::bind(&LLVOAvatarSelf::updateAvatarRezMetrics, false), 5.0); } // virtual @@ -2247,6 +2247,11 @@ private: bool LLVOAvatarSelf::updateAvatarRezMetrics(bool force_send) { + //Can be called via event system after agent avatar has been removed. + //Also skip if quit has been requested, because we already send out rez metrics when entering the quit state. + if(!isAgentAvatarValid() || LLAppViewer::instance()->quitRequested()) + return false; + const F32 AV_METRICS_INTERVAL_QA = 30.0; F32 send_period = 300.0; if (gSavedSettings.getBOOL("QAModeMetrics")) @@ -2254,13 +2259,13 @@ bool LLVOAvatarSelf::updateAvatarRezMetrics(bool force_send) send_period = AV_METRICS_INTERVAL_QA; } - if (force_send || mTimeSinceLastRezMessage.getElapsedTimeF32() > send_period) + if (force_send || gAgentAvatarp->mTimeSinceLastRezMessage.getElapsedTimeF32() > send_period) { - // Stats for completed phases have been getting logged as they + // Stats for completed phases have been getting l ogged as they // complete. This will give us stats for any timers that // haven't finished as of the metric's being sent. LLVOAvatar::logPendingPhasesAllAvatars(); - sendViewerAppearanceChangeMetrics(); + gAgentAvatarp->sendViewerAppearanceChangeMetrics(); } return false; diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index 3c0dba237..e7a59d1a3 100644 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -380,7 +380,7 @@ public: }; LLTimer mTimeSinceLastRezMessage; - bool updateAvatarRezMetrics(bool force_send); + static bool updateAvatarRezMetrics(bool force_send); std::vector mPendingTimerRecords; void addMetricsTimerRecord(const LLSD& record); diff --git a/indra/newview/llvowlsky.cpp b/indra/newview/llvowlsky.cpp index 757c04b7e..5509f9ad9 100644 --- a/indra/newview/llvowlsky.cpp +++ b/indra/newview/llvowlsky.cpp @@ -814,18 +814,18 @@ BOOL LLVOWLSky::updateStarGeometry(LLDrawable *drawable) up *= sc; *(verticesp++) = mStarVertices[vtx]; - *(verticesp++) = mStarVertices[vtx]+left; - *(verticesp++) = mStarVertices[vtx]+left+up; - *(verticesp++) = mStarVertices[vtx]+left; - *(verticesp++) = mStarVertices[vtx]+left+up; *(verticesp++) = mStarVertices[vtx]+up; + *(verticesp++) = mStarVertices[vtx]+left+up; + *(verticesp++) = mStarVertices[vtx]; + *(verticesp++) = mStarVertices[vtx]+left+up; + *(verticesp++) = mStarVertices[vtx]+left; - *(texcoordsp++) = LLVector2(0,0); - *(texcoordsp++) = LLVector2(0,1); - *(texcoordsp++) = LLVector2(1,1); - *(texcoordsp++) = LLVector2(0,1); - *(texcoordsp++) = LLVector2(1,1); *(texcoordsp++) = LLVector2(1,0); + *(texcoordsp++) = LLVector2(1,1); + *(texcoordsp++) = LLVector2(0,1); + *(texcoordsp++) = LLVector2(1,0); + *(texcoordsp++) = LLVector2(0,1); + *(texcoordsp++) = LLVector2(0,0); *(colorsp++) = LLColor4U(mStarColors[vtx]); *(colorsp++) = LLColor4U(mStarColors[vtx]);