merge

1 files changed, 34 insertions, 0 deletions

diff --git a/indra/win_crash_logger/llcrashloggerwindows.h b/indra/win_crash_logger/llcrashloggerwindows.h
index 5c45a998b3..1812e2737e 100755..100644
--- a/indra/win_crash_logger/llcrashloggerwindows.h
+++ b/indra/win_crash_logger/llcrashloggerwindows.h
@@ -31,20 +31,54 @@
 #include "windows.h"
 #include "llstring.h"
 
+class LLSD;
+
+namespace google_breakpad {
+	class CrashGenerationServer; 
+	class ClientInfo;
+}
+
 class LLCrashLoggerWindows : public LLCrashLogger
 {
 public:
 	LLCrashLoggerWindows(void);
 	~LLCrashLoggerWindows(void);
+	static LLCrashLoggerWindows* sInstance; 
+
 	virtual bool init();
 	virtual bool mainLoop();
 	virtual void updateApplication(const std::string& message = LLStringUtil::null);
 	virtual bool cleanup();
 	virtual void gatherPlatformSpecificFiles();
 	void setHandle(HINSTANCE hInst) { mhInst = hInst; }
+    int clients_connected() const {
+        return mClientsConnected;
+    }
+	bool getMessageWithTimeout(MSG *msg, UINT to);
+    
+    // Starts the processing loop. This function does not return unless the
+    // user is logging off or the user closes the crash service window. The
+    // return value is a good number to pass in ExitProcess().
+    int processingLoop();
 private:
 	void ProcessDlgItemText(HWND hWnd, int nIDDlgItem);
 	void ProcessCaption(HWND hWnd);
+	bool initCrashServer();
+	google_breakpad::CrashGenerationServer* mCrashHandler;
+	static void OnClientConnected(void* context,
+ 					const google_breakpad::ClientInfo* client_info);
+ 	
+ 	static void OnClientDumpRequest(
+ 					void* context,
+ 					const google_breakpad::ClientInfo* client_info,
+ 					const std::wstring* file_path);
+ 	
+ 	static void OnClientExited(void* context,
+		 			const google_breakpad::ClientInfo* client_info);
+    int mClientsConnected;
+	int mPID;
+	std::string mProcName;
+    
 	HINSTANCE mhInst;
 
 };