diff options
author | Jacek Antonelli | 2008-10-17 19:06:47 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-10-17 19:07:46 -0500 |
commit | 8f50d81693ff9463ae49c36935977a2b70e6bf45 (patch) | |
tree | c9cfff9baa90394b8a3866c5696c84352f19bba6 /linden/indra/newview/llviewerwindow.h | |
parent | Fixed bad panel_overlay XML from a sloppy merge. (diff) | |
parent | Second Life viewer sources 1.21.6 (diff) | |
download | meta-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/newview/llviewerwindow.h')
-rw-r--r-- | linden/indra/newview/llviewerwindow.h | 6 |
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 | |||
372 | public: | 376 | public: |
373 | LLWindow* mWindow; // graphical window object | 377 | LLWindow* mWindow; // graphical window object |
374 | 378 | ||