From c17db85e73a91c145d6eebe36b3b05e2289deae0 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 27 Mar 2013 13:20:48 -0400
Subject: add platform and platform version to login request parameters for new
 version manager query

---
 indra/newview/lllogininstance.h | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/indra/newview/lllogininstance.h b/indra/newview/lllogininstance.h
index 8b53431219..83191e50bd 100644
--- a/indra/newview/lllogininstance.h
+++ b/indra/newview/lllogininstance.h
@@ -66,6 +66,7 @@ public:
 	void setSkipOptionalUpdate(bool state) { mSkipOptionalUpdate = state; }
 	void setSerialNumber(const std::string& sn) { mSerialNumber = sn; }
 	void setLastExecEvent(int lee) { mLastExecEvent = lee; }
+	void setPlatformInfo(const std::string platform, const std::string platform_version);
 
 	void setNotificationsInterface(LLNotificationsInterface* ni) { mNotifications = ni; }
 
@@ -99,6 +100,8 @@ private:
 	F64 mTransferRate;
 	std::string mSerialNumber;
 	int mLastExecEvent;
+	std::string mPlatform;
+	std::string mPlatformVersion;
 	UpdaterLauncherCallback mUpdaterLauncher;
 	LLEventDispatcher mDispatcher;
 	LLUpdaterService * mUpdaterService;	
-- 
cgit v1.2.3


From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Fri, 29 Mar 2013 07:50:08 -0700
Subject: Update Mac and Windows breakpad builds to latest

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

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

diff --git a/indra/newview/lllogininstance.h b/indra/newview/lllogininstance.h
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From ce0dbbd8a543a32e033eb15888259151ca113539 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 2 Apr 2013 12:57:09 -0400
Subject: Add reporting of last_exec_duration (and clean up logic around
 multiple instances)

---
 indra/newview/lllogininstance.h | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/indra/newview/lllogininstance.h b/indra/newview/lllogininstance.h
index 83191e50bd..b0247da7c8 100644
--- a/indra/newview/lllogininstance.h
+++ b/indra/newview/lllogininstance.h
@@ -66,6 +66,7 @@ public:
 	void setSkipOptionalUpdate(bool state) { mSkipOptionalUpdate = state; }
 	void setSerialNumber(const std::string& sn) { mSerialNumber = sn; }
 	void setLastExecEvent(int lee) { mLastExecEvent = lee; }
+	void setLastExecDuration(S32 duration) { mLastExecDuration = duration; }
 	void setPlatformInfo(const std::string platform, const std::string platform_version);
 
 	void setNotificationsInterface(LLNotificationsInterface* ni) { mNotifications = ni; }
@@ -100,6 +101,7 @@ private:
 	F64 mTransferRate;
 	std::string mSerialNumber;
 	int mLastExecEvent;
+	S32 mLastExecDuration;
 	std::string mPlatform;
 	std::string mPlatformVersion;
 	UpdaterLauncherCallback mUpdaterLauncher;
-- 
cgit v1.2.3