From da94c0eaa2ce2711f0ae26968e87ef3e409126a9 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
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 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/llwindow/llwindow.cpp')

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
-- 
cgit v1.2.3