Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting/

2 files changed, 0 insertions, 17 deletions

diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp
index b303dfbdb4..94c2e40bb1 100644
--- a/indra/newview/llscenemonitor.cpp
+++ b/indra/newview/llscenemonitor.cpp
@@ -496,14 +496,6 @@ void LLSceneMonitor::fetchQueryResult()
 	}
 }
 
-void LLSceneMonitor::addMonitorResult()
-{
-	ll_monitor_result_t result;
-	result.mTimeStamp = LLImageGL::sLastFrameTime;
-	result.mDiff = mDiffResult;
-	mMonitorResults.push_back(result);
-}
-
 //dump results to a file _scene_xmonitor_results.csv
 void LLSceneMonitor::dumpToFile(std::string file_name)
 {
diff --git a/indra/newview/llscenemonitor.h b/indra/newview/llscenemonitor.h
index f43c455f2f..3351ed0579 100644
--- a/indra/newview/llscenemonitor.h
+++ b/indra/newview/llscenemonitor.h
@@ -73,7 +73,6 @@ private:
 	LLRenderTarget& getCaptureTarget();
 	void generateDitheringTexture(S32 width, S32 height);
 
-	void addMonitorResult();
 private:
 	bool mEnabled;
 	bool mDebugViewerVisible;
@@ -105,14 +104,6 @@ private:
 	std::vector<LLAnimPauseRequest> mAvatarPauseHandles;
 
 	LLTrace::ExtendablePeriodicRecording* mRecording;
-
-	//---------------------------------------
-	typedef struct _monitor_result
-	{
-		F32 mTimeStamp;
-		F32 mDiff;
-	} ll_monitor_result_t;
-	std::vector<ll_monitor_result_t> mMonitorResults;
 };
 
 class LLSceneMonitorView : public LLFloater