diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-02-01 11:16:43 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-02-01 11:16:43 -0500 |
| commit | 293b35f000ca4e8a4bcf85dc4782b2a72d1887ea (patch) | |
| tree | 70c1731808e5449a56b8a38007c6c952bb559f48 /indra/newview/pipeline.h | |
| parent | d0cba9e9194841e8867afcbd02b3792b652756ab (diff) | |
| parent | ee39db49a38a626e72e1924e4c157b16d90e8ee6 (diff) | |
Automated merge from mesh-development
Diffstat (limited to 'indra/newview/pipeline.h')
| -rw-r--r-- | indra/newview/pipeline.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index 7ae83e9816..0eb020605e 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -632,6 +632,8 @@ protected: LLDrawable::drawable_list_t mBuildQ2; // non-priority LLSpatialGroup::sg_vector_t mGroupQ1; //priority LLSpatialGroup::sg_vector_t mGroupQ2; // non-priority + bool mGroupQ2Locked; + bool mGroupQ1Locked; LLViewerObject::vobj_list_t mCreateQ; |