aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llwindow/llwindow.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-10-17 19:06:47 -0500
committerJacek Antonelli2008-10-17 19:07:46 -0500
commit8f50d81693ff9463ae49c36935977a2b70e6bf45 (patch)
treec9cfff9baa90394b8a3866c5696c84352f19bba6 /linden/indra/llwindow/llwindow.cpp
parentFixed bad panel_overlay XML from a sloppy merge. (diff)
parentSecond Life viewer sources 1.21.6 (diff)
downloadmeta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.zip
meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.tar.gz
meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.tar.bz2
meta-impy-8f50d81693ff9463ae49c36935977a2b70e6bf45.tar.xz
Updated source to SL version 1.21.6.
Diffstat (limited to 'linden/indra/llwindow/llwindow.cpp')
-rw-r--r--linden/indra/llwindow/llwindow.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/linden/indra/llwindow/llwindow.cpp b/linden/indra/llwindow/llwindow.cpp
index f4ee8cc..e8b0a1b 100644
--- a/linden/indra/llwindow/llwindow.cpp
+++ b/linden/indra/llwindow/llwindow.cpp
@@ -208,6 +208,17 @@ void LLWindowCallbacks::handlePingWatchdog(LLWindow *window, const char * msg)
208 208
209} 209}
210 210
211void LLWindowCallbacks::handlePauseWatchdog(LLWindow *window)
212{
213
214}
215
216void LLWindowCallbacks::handleResumeWatchdog(LLWindow *window)
217{
218
219}
220
221
211S32 OSMessageBox(const std::string& text, const std::string& caption, U32 type) 222S32 OSMessageBox(const std::string& text, const std::string& caption, U32 type)
212{ 223{
213 // Properly hide the splash screen when displaying the message box 224 // Properly hide the splash screen when displaying the message box