diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-05-02 15:59:15 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-05-02 15:59:15 -0700 |
| commit | 56af97063aaa35c1a70f5edaf47f4a015600860d (patch) | |
| tree | 299b113fab1ff7176c86342aa3e881491cd3b883 /indra/newview/llappviewer.cpp | |
| parent | b679975d8fdc22d33d0f62288934be8f0209157e (diff) | |
| parent | 681c5de92bd09622de360818682240b0a17403f7 (diff) | |
Pull from vir/drano
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index a627f3868b..178b96e42e 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -93,6 +93,7 @@ #include "llsecondlifeurls.h" #include "llupdaterservice.h" #include "llcallfloater.h" +#include "llfloatertexturefetchdebugger.h" // Linden library includes #include "llavatarnamecache.h" @@ -1218,7 +1219,7 @@ bool LLAppViewer::mainLoop() if(mem_leak_instance) { mem_leak_instance->idle() ; - } + } // canonical per-frame event mainloop.post(newFrame); @@ -1403,6 +1404,17 @@ bool LLAppViewer::mainLoop() LLLFSThread::sLocal->pause(); } + //texture fetching debugger + if(LLTextureFetchDebugger::isEnabled()) + { + LLFloaterTextureFetchDebugger* tex_fetch_debugger_instance = + LLFloaterReg::findTypedInstance<LLFloaterTextureFetchDebugger>("tex_fetch_debugger"); + if(tex_fetch_debugger_instance) + { + tex_fetch_debugger_instance->idle() ; + } + } + if ((LLStartUp::getStartupState() >= STATE_CLEANUP) && (frameTimer.getElapsedTimeF64() > FRAME_STALL_THRESHOLD)) { |