From cb2b59b48b6cf8aeb17f5b0f9f4063e8340ce144 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Tue, 10 Jul 2012 00:42:10 +0000
Subject: Added new settings: DisableAllRenderTypes, DisableAllRenderFeatures,
 and MaxFPS.

---
 indra/newview/llappviewer.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/llappviewer.h')

diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index ae3c795d1e..f55954234f 100644
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -254,6 +254,7 @@ private:
     bool mQuitRequested;				// User wants to quit, may have modified documents open.
     bool mLogoutRequestSent;			// Disconnect message sent to simulator, no longer safe to send messages to the sim.
     S32 mYieldTime;
+	F32 mMinFrameTime;
 	struct SettingsFiles* mSettingsLocationList;
 
 	LLWatchdogTimeout* mMainloopTimeout;
-- 
cgit v1.2.3


From a589bc99701d6258d3dd467a5d36fb989348a758 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Wed, 11 Jul 2012 00:30:04 +0000
Subject: Added LLPipeline eventhost API.  Added ForcePeriodicRenderingTime
 setting.

---
 indra/newview/llappviewer.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/newview/llappviewer.h')

diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index f55954234f..043893020b 100644
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -253,8 +253,6 @@ private:
 
     bool mQuitRequested;				// User wants to quit, may have modified documents open.
     bool mLogoutRequestSent;			// Disconnect message sent to simulator, no longer safe to send messages to the sim.
-    S32 mYieldTime;
-	F32 mMinFrameTime;
 	struct SettingsFiles* mSettingsLocationList;
 
 	LLWatchdogTimeout* mMainloopTimeout;
-- 
cgit v1.2.3


From 741821eb6a8717896307da44b1b8e7078a865fff Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 15 Feb 2013 09:52:11 -0500
Subject: SH-3867 FIX - on logout, wait for any pending metrics uploads to
 complete

---
 indra/newview/llappviewer.h | 2 ++
 1 file changed, 2 insertions(+)
 mode change 100644 => 100755 indra/newview/llappviewer.h

(limited to 'indra/newview/llappviewer.h')

diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
old mode 100644
new mode 100755
index be72421c58..b69a1944a6
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -341,6 +341,8 @@ extern LLFrameTimer gLoggedInTime;
 extern F32 gLogoutMaxTime;
 extern LLTimer gLogoutTimer;
 
+extern S32 gPendingMetricsUploads;
+
 extern F32 gSimLastTime; 
 extern F32 gSimFrames;
 
-- 
cgit v1.2.3