diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-01-21 15:35:40 +0000 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-01-21 15:35:40 +0000 |
| commit | 435dcdb3e307f70b5d0be801a98fb05cb1c87fcf (patch) | |
| tree | 1a5bc4c64c1eb70e65225b30694dc34718aeb294 /indra/newview/llviewerdisplay.cpp | |
| parent | bf1219eb59a9dbaebd3e2052963ded76bfcb0b21 (diff) | |
| parent | 1a927f38d2266220f4000f35f64328476f9ffde6 (diff) | |
Merged from ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 7b9b12108d..ba256d70e8 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -483,7 +483,6 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) { LLAppViewer::instance()->pingMainloopTimeout("Display:Disconnected"); render_ui(); - render_disconnected_background(); } ////////////////////////// @@ -1141,6 +1140,10 @@ void render_ui(F32 zoom_factor, int subfield) render_ui_3d(); LLGLState::checkStates(); } + else + { + render_disconnected_background(); + } render_ui_2d(); LLGLState::checkStates(); |