diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-21 14:39:43 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-21 14:39:43 +0200 |
| commit | 267b7ad011f366f84509a7388d66798a5c7b380b (patch) | |
| tree | f7c939b0748ca81451f5a2adbaef0b8211da5735 /indra/newview/llviewerdisplay.cpp | |
| parent | 30fbb126af61c72054b5794c0132c8223babb1f3 (diff) | |
| parent | 1a927f38d2266220f4000f35f64328476f9ffde6 (diff) | |
Merge from default branch
--HG--
branch : product-engine
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(); |