diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-12-20 09:19:21 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-12-20 09:19:21 -0500 |
| commit | 540dc4b955639cc201b98eedd1372a02eabf098c (patch) | |
| tree | 527deb7748bfbc6f859f42a837be84a18688e83e /indra/newview/llappviewer.cpp | |
| parent | c7a79760106ae97a3a6a1fd55417eef471b0ccab (diff) | |
| parent | 8ca5050231b37fc92b5d123b3564cbec6c11778d (diff) | |
merge up to latest viewer-development
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index b45f9c55fb..0861fe85a8 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -75,6 +75,7 @@ //#include "llfirstuse.h" #include "llrender.h" #include "llteleporthistory.h" +#include "lltoast.h" #include "lllocationhistory.h" #include "llfasttimerview.h" #include "llvector4a.h" @@ -4051,6 +4052,7 @@ void LLAppViewer::idle() LLFrameTimer::updateFrameTime(); LLFrameTimer::updateFrameCount(); LLEventTimer::updateClass(); + LLNotificationsUI::LLToast::updateClass(); LLCriticalDamp::updateInterpolants(); LLMortician::updateClass(); LLFilePickerThread::clearDead(); //calls LLFilePickerThread::notify() |