diff options
| author | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
| commit | fdf944fb0355249d73c4e25ee86e9ffd378e7d4b (patch) | |
| tree | 2e5c51fe0e6d5757f984721e01cc097801d927e7 /linden/indra/llwindow/llwindow.h | |
| parent | Rebranded Windows-specific installer/support files. (diff) | |
| parent | Updated source to SL version 1.21.6. (diff) | |
| download | meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.zip meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.gz meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.bz2 meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.xz | |
Merge branch 'merge-1.21.6' into rebranding
Conflicts:
linden/indra/newview/installers/windows/installer_template.nsi
linden/indra/newview/llappviewer.cpp
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llwindow/llwindow.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/llwindow/llwindow.h b/linden/indra/llwindow/llwindow.h index cee83b9..7e948b9 100644 --- a/linden/indra/llwindow/llwindow.h +++ b/linden/indra/llwindow/llwindow.h | |||
| @@ -119,7 +119,11 @@ public: | |||
| 119 | virtual void handleDataCopy(LLWindow *window, S32 data_type, void *data); | 119 | virtual void handleDataCopy(LLWindow *window, S32 data_type, void *data); |
| 120 | virtual BOOL handleTimerEvent(LLWindow *window); | 120 | virtual BOOL handleTimerEvent(LLWindow *window); |
| 121 | virtual BOOL handleDeviceChange(LLWindow *window); | 121 | virtual BOOL handleDeviceChange(LLWindow *window); |
| 122 | |||
| 122 | virtual void handlePingWatchdog(LLWindow *window, const char * msg); | 123 | virtual void handlePingWatchdog(LLWindow *window, const char * msg); |
| 124 | virtual void handlePauseWatchdog(LLWindow *window); | ||
| 125 | virtual void handleResumeWatchdog(LLWindow *window); | ||
| 126 | |||
| 123 | }; | 127 | }; |
| 124 | 128 | ||
| 125 | // Refer to llwindow_test in test/common/llwindow for usage example | 129 | // Refer to llwindow_test in test/common/llwindow for usage example |