aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerwindow.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-28 17:21:23 -0500
committerJacek Antonelli2008-09-28 17:21:46 -0500
commit31e7c77a411d94bc87f0232588b339149bb29a49 (patch)
tree49e487700e91713e620e4d33f20b7f7afb5a2fa9 /linden/indra/newview/llviewerwindow.h
parentSecond Life viewer sources 1.21.2-RC (diff)
downloadmeta-impy-31e7c77a411d94bc87f0232588b339149bb29a49.zip
meta-impy-31e7c77a411d94bc87f0232588b339149bb29a49.tar.gz
meta-impy-31e7c77a411d94bc87f0232588b339149bb29a49.tar.bz2
meta-impy-31e7c77a411d94bc87f0232588b339149bb29a49.tar.xz
Second Life viewer sources 1.21.3-RC
Diffstat (limited to 'linden/indra/newview/llviewerwindow.h')
-rw-r--r--linden/indra/newview/llviewerwindow.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewerwindow.h b/linden/indra/newview/llviewerwindow.h
index 9262e61..21df0d5 100644
--- a/linden/indra/newview/llviewerwindow.h
+++ b/linden/indra/newview/llviewerwindow.h
@@ -174,7 +174,10 @@ public:
174 /*virtual*/ void handleDataCopy(LLWindow *window, S32 data_type, void *data); 174 /*virtual*/ void handleDataCopy(LLWindow *window, S32 data_type, void *data);
175 /*virtual*/ BOOL handleTimerEvent(LLWindow *window); 175 /*virtual*/ BOOL handleTimerEvent(LLWindow *window);
176 /*virtual*/ BOOL handleDeviceChange(LLWindow *window); 176 /*virtual*/ BOOL handleDeviceChange(LLWindow *window);
177
177 /*virtual*/ void handlePingWatchdog(LLWindow *window, const char * msg); 178 /*virtual*/ void handlePingWatchdog(LLWindow *window, const char * msg);
179 /*virtual*/ void handlePauseWatchdog(LLWindow *window);
180 /*virtual*/ void handleResumeWatchdog(LLWindow *window);
178 181
179 182
180 // 183 //
@@ -368,7 +371,8 @@ private:
368 void restoreGL(const std::string& progress_message = LLStringUtil::null); 371 void restoreGL(const std::string& progress_message = LLStringUtil::null);
369 void initFonts(F32 zoom_factor = 1.f); 372 void initFonts(F32 zoom_factor = 1.f);
370 void schedulePick(LLPickInfo& pick_info); 373 void schedulePick(LLPickInfo& pick_info);
371 374 S32 getChatConsoleBottomPad(); // Vertical padding for child console rect, varied by bottom clutter
375
372public: 376public:
373 LLWindow* mWindow; // graphical window object 377 LLWindow* mWindow; // graphical window object
374 378