diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-08 09:24:58 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-08 09:24:58 -0400 |
| commit | ed32a5e2b8e865cfad1d697fd5542b05162c40a9 (patch) | |
| tree | 36616fdac52c4149dd88204054e9cf7e1342ff87 /indra/newview/llviewerdisplay.cpp | |
| parent | 9c2f2b884a16d180f83e76d3ed58c949c9692eaf (diff) | |
| parent | 444311d58082ae1277a3628fbe380f7407910f50 (diff) | |
pull tags and late fixes back from viewer-pre-release
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 41b7c13826..de8e37b572 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -115,8 +115,7 @@ void display_startup() { if ( !gViewerWindow->getActive() || !gViewerWindow->mWindow->getVisible() - || gViewerWindow->mWindow->getMinimized() - || gNoRender ) + || gViewerWindow->mWindow->getMinimized() ) { return; } @@ -294,7 +293,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) // Logic for forcing window updates if we're in drone mode. // - if (gNoRender) + // *TODO: Investigate running display() during gHeadlessClient. See if this early exit is needed DK 2011-02-18 + if (gHeadlessClient) { #if LL_WINDOWS static F32 last_update_time = 0.f; |