diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-07 10:38:06 -0800 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-07 10:38:06 -0800 |
| commit | ac5a8ca6072e3d92e7253a0ca21ffe4369155bbb (patch) | |
| tree | 58e5c8dcb57a7fd3453c3bad018b7fe35c4096c9 /indra/newview/llappviewer.cpp | |
| parent | 75bd1db979497c7f7509980a9ab602b250116da7 (diff) | |
| parent | 11f2ad21590147e4d426320d1d336a3dac82a34b (diff) | |
Automated merge with https://bitbucket.org/mani_linden/viewer-development/
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 31115a4218..08e40168c3 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -80,6 +80,7 @@ #include "llfeaturemanager.h" #include "llurlmatch.h" #include "lltextutil.h" +#include "lllogininstance.h" #include "llweb.h" #include "llsecondlifeurls.h" @@ -590,10 +591,14 @@ LLAppViewer::LLAppViewer() : setupErrorHandling(); sInstance = this; gLoggedInTime.stop(); + + LLLoginInstance::instance().setUpdaterService(mUpdater.get()); } LLAppViewer::~LLAppViewer() { + LLLoginInstance::instance().setUpdaterService(0); + destroyMainloopTimeout(); // If we got to this destructor somehow, the app didn't hang. |