diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-04-27 00:00:07 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-04-27 00:00:07 -0700 |
| commit | 793d8a4f62952fa4fa482a5f43dc1b422c195dc2 (patch) | |
| tree | 70314de695fac0ebfdc215f94c9da8c9fb1f9270 /indra/newview/llappviewer.cpp | |
| parent | e1ddeb5364d53cfa834d9651d079d8913083263a (diff) | |
| parent | e703232cae0e692c813ba119e283ffd2d150fec8 (diff) | |
Pull merge from drano-sh-3086
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 3ee53c679f..bb6658dc48 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1219,15 +1219,7 @@ bool LLAppViewer::mainLoop() if(mem_leak_instance) { mem_leak_instance->idle() ; - } - - //texture fetching debugger - LLFloaterTextureFetchDebugger* tex_fetch_debugger_instance = - LLFloaterReg::findTypedInstance<LLFloaterTextureFetchDebugger>("tex_fetch_debugger"); - if(tex_fetch_debugger_instance) - { - tex_fetch_debugger_instance->idle() ; - } + } // canonical per-frame event mainloop.post(newFrame); @@ -1412,6 +1404,14 @@ bool LLAppViewer::mainLoop() LLLFSThread::sLocal->pause(); } + //texture fetching debugger + 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)) { |