diff options
author | Oz Linden <oz@lindenlab.com> | 2011-12-21 09:42:55 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-12-21 09:42:55 -0500 |
commit | 889d4d292b2318a2be4988a700d5f56a193a377a (patch) | |
tree | 3e8be1a0c02e24c029b3baeb1abe3bce3e8bdcc9 /indra/newview/llappviewer.cpp | |
parent | 457f150734c0f1b92f1c5c6cdb3a73fa0201183d (diff) | |
parent | b022ebf13c9a227f87a112419e237894a1231c8c (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() |