From da94c0eaa2ce2711f0ae26968e87ef3e409126a9 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 12 Sep 2008 06:27:13 +0000 Subject: QAR-855 Viewer 1.21 RC 2 merge viewer_1-21 94770-96059 -> release --- indra/llwindow/llwindow.cpp | 5 +++++ indra/llwindow/llwindow.h | 1 + indra/llwindow/llwindowwin32.cpp | 4 +++- 3 files changed, 9 insertions(+), 1 deletion(-) (limited to 'indra/llwindow') diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp index 6b1cabc505..4f467be02d 100644 --- a/indra/llwindow/llwindow.cpp +++ b/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/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h index ec09234c83..9b1f005920 100644 --- a/indra/llwindow/llwindow.h +++ b/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/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 1aaf18e3b6..0f2ef525b2 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/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)) { -- cgit v1.2.3