From 9f097380b85a307db472726175c3515fdeb5aed5 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Fri, 18 Oct 2013 09:14:53 -0700 Subject: removed asserts in order to get testable builds again added unpause() behavior and changed pause() to do nothing when already stopped --- indra/newview/llappviewer.cpp | 2 -- indra/newview/llviewerassetstats.cpp | 8 -------- indra/newview/llviewerassetstats.h | 4 ---- 3 files changed, 14 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 037a9bda86..0c9baec00a 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -5601,8 +5601,6 @@ void LLAppViewer::metricsSend(bool enable_reporting) LLViewerAssetStats * main_stats(new LLViewerAssetStats(*gViewerAssetStats)); main_stats->stop(); - main_stats->updateStats(); - // Send a report request into 'thread1' to get the rest of the data // and provide some additional parameters while here. LLAppViewer::sTextureFetch->commandSendMetrics(caps_url, diff --git a/indra/newview/llviewerassetstats.cpp b/indra/newview/llviewerassetstats.cpp index e009863002..54ac29723f 100755 --- a/indra/newview/llviewerassetstats.cpp +++ b/indra/newview/llviewerassetstats.cpp @@ -353,14 +353,6 @@ void LLViewerAssetStats::setRegion(region_handle_t region_handle) mRegionHandle = region_handle; } -void LLViewerAssetStats::updateStats() -{ - if (mCurRecording && mCurRecording->isStarted()) - { - mCurRecording->update(); - } -} - void LLViewerAssetStats::getStats(AssetStats& stats, bool compact_output) { using namespace LLViewerAssetStatsFF; diff --git a/indra/newview/llviewerassetstats.h b/indra/newview/llviewerassetstats.h index aaa299bf4b..9d425c82fc 100755 --- a/indra/newview/llviewerassetstats.h +++ b/indra/newview/llviewerassetstats.h @@ -162,10 +162,6 @@ public: // collection calls. void setRegion(region_handle_t region_handle); - // gather latest metrics data - // call from main thread - void updateStats(); - // Retrieve current metrics for all visited regions (NULL region UUID/handle excluded) // Uses AssetStats structure seen above void getStats(AssetStats& stats, bool compact_output); -- cgit v1.2.3