diff options
| author | Jacek Antonelli | 2009-09-25 22:15:49 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-25 22:15:49 -0500 |
| commit | 5ff1687542240fe9b00d4c217b764770fc369c06 (patch) | |
| tree | bc5a1dbc882c19120ca00efb9914d70059cd79cb /linden/indra/newview/llappviewerlinux.h | |
| parent | Merge remote branch 'mccabe/1.2.0-next' into next (diff) | |
| parent | Removed grid stuff from World Map (for now). (diff) | |
| download | meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.zip meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.tar.gz meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.tar.bz2 meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.tar.xz | |
Merge branch 'gridmanager' into next
Diffstat (limited to 'linden/indra/newview/llappviewerlinux.h')
| -rw-r--r-- | linden/indra/newview/llappviewerlinux.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llappviewerlinux.h b/linden/indra/newview/llappviewerlinux.h index b464e48..2f5c13b 100644 --- a/linden/indra/newview/llappviewerlinux.h +++ b/linden/indra/newview/llappviewerlinux.h | |||
| @@ -61,9 +61,10 @@ public: | |||
| 61 | 61 | ||
| 62 | protected: | 62 | protected: |
| 63 | virtual bool beingDebugged(); | 63 | virtual bool beingDebugged(); |
| 64 | 64 | ||
| 65 | virtual bool restoreErrorTrap(); | 65 | virtual bool restoreErrorTrap(); |
| 66 | virtual void handleCrashReporting(bool reportFreeze); | 66 | virtual void handleCrashReporting(bool reportFreeze); |
| 67 | |||
| 67 | virtual void handleSyncCrashTrace(); | 68 | virtual void handleSyncCrashTrace(); |
| 68 | 69 | ||
| 69 | virtual bool initLogging(); | 70 | virtual bool initLogging(); |