diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-06 19:20:03 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-06 19:20:03 -0400 |
| commit | 52615d251bc9261fe5765feefbcd31021bd75934 (patch) | |
| tree | 2e259b393c6d2405d4a5e30ae9dd25e282c78a4d /indra/newview/llviewerdisplay.cpp | |
| parent | 0a802ae351153008b40d42106c866836d0ee4954 (diff) | |
| parent | a1a5a793a70f62c977e97b7433840fcb70f47c03 (diff) | |
pull pack late beta fixes from 2.6.3
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; |