diff options
author | Xiaohong Bao <bao@lindenlab.com> | 2010-05-13 18:32:32 -0600 |
---|---|---|
committer | Xiaohong Bao <bao@lindenlab.com> | 2010-05-13 18:32:32 -0600 |
commit | 3ce4cecd681f3f95c7b1fe04db75c384d0b0854e (patch) | |
tree | 4fcc803b08b636491e7bf5a0c8270a7c3c36ac36 /indra/newview/llviewerdisplay.cpp | |
parent | aebb49520b1919e0ac2bcc7373fc2db031e3b7f0 (diff) | |
parent | 0f7277b98ba25043bef03f2636b9b2285159bc75 (diff) |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
-rw-r--r-- | indra/newview/llviewerdisplay.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index f0800e82e7..3482ac508e 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -731,6 +731,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) { LLViewerCamera::sCurCameraID = LLViewerCamera::CAMERA_WORLD; LLMemType mt_ss(LLMemType::MTYPE_DISPLAY_STATE_SORT); + gPipeline.sAllowRebuildPriorityGroup = TRUE ; gPipeline.stateSort(*LLViewerCamera::getInstance(), result); stop_glerror(); |