3 files changed, 9 insertions, 1 deletions

diff --git a/linden/indra/llwindow/llwindow.cpp b/linden/indra/llwindow/llwindow.cpp
index 890143d..f4ee8cc 100644
--- a/linden/indra/llwindow/llwindow.cpp
+++ b/linden/indra/llwindow/llwindow.cpp
@@ -203,6 +203,11 @@ BOOL LLWindowCallbacks::handleDeviceChange(LLWindow *window)
         return FALSE;
 }
 
+void LLWindowCallbacks::handlePingWatchdog(LLWindow *window, const char * msg)
+{
+
+}
+
 S32 OSMessageBox(const std::string& text, const std::string& caption, U32 type)
 {
         // Properly hide the splash screen when displaying the message box
diff --git a/linden/indra/llwindow/llwindow.h b/linden/indra/llwindow/llwindow.h
index 82e95a8..cee83b9 100644
--- a/linden/indra/llwindow/llwindow.h
+++ b/linden/indra/llwindow/llwindow.h
@@ -119,6 +119,7 @@ public:
         virtual void handleDataCopy(LLWindow *window, S32 data_type, void *data);
         virtual BOOL handleTimerEvent(LLWindow *window);
         virtual BOOL handleDeviceChange(LLWindow *window);
+        virtual void handlePingWatchdog(LLWindow *window, const char * msg);
 };
 
 // Refer to llwindow_test in test/common/llwindow for usage example
diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index 047fa31..3729a71 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -1575,7 +1575,9 @@ void LLWindowWin32::gatherInput()
 
         while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE) && msg_count < MAX_MESSAGE_PER_UPDATE)
         {
+                mCallbacks->handlePingWatchdog(this, "Main:TranslateGatherInput");
                 TranslateMessage(&msg);
+                mCallbacks->handlePingWatchdog(this, "Main:DispatchGatherInput");
                 DispatchMessage(&msg);
                 msg_count++;
 
@@ -1602,7 +1604,7 @@ void LLWindowWin32::gatherInput()
                         }
                 }
                 */
-
+                mCallbacks->handlePingWatchdog(this, "Main:AsyncCallbackGatherInput");
                 // For async host by name support.  Really hacky.
                 if (gAsyncMsgCallback && (LL_WM_HOST_RESOLVED == msg.message))
                 {