diff options
| author | Jacek Antonelli | 2009-09-09 12:27:11 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-10 02:26:28 -0500 |
| commit | e944c5086e47e92e7952e5a43c68f01108899656 (patch) | |
| tree | c47ff63c4dcae473cd07a0dbcbc9d52636e6061e /linden/indra/newview/llappviewerlinux.h | |
| parent | Commented out Linux tarball building. (diff) | |
| parent | looks like working now (diff) | |
| download | meta-impy-e944c5086e47e92e7952e5a43c68f01108899656.zip meta-impy-e944c5086e47e92e7952e5a43c68f01108899656.tar.gz meta-impy-e944c5086e47e92e7952e5a43c68f01108899656.tar.bz2 meta-impy-e944c5086e47e92e7952e5a43c68f01108899656.tar.xz | |
Merged 'armin/grid-manager5' into login-manager
Conflicts:
linden/indra/newview/CMakeLists.txt
linden/indra/newview/llpanellogin.cpp
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(); |