diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-26 14:50:36 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-26 14:50:36 -0800 |
| commit | 14e82732f4f74ec59933bb9e6c67cf1ce7800a7f (patch) | |
| tree | c2b5ff471400ced9342f7f3c1e4bc6b32d8df79f /indra/newview/pipeline.h | |
| parent | a897e69ffc36b8159e89031c38846395b6551d0b (diff) | |
| parent | 890965faf5baa5f6f832e086991d59bb8d33b7bc (diff) | |
merging in latest changes, resolved llimview.cpp conflict
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 fd2a1e06cd..7a0ca86231 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -668,6 +668,8 @@ protected: LLSpatialGroup::sg_vector_t mGroupQ1; //priority LLSpatialGroup::sg_vector_t mGroupQ2; // non-priority + LLSpatialGroup::sg_vector_t mGroupSaveQ1; // a place to save mGroupQ1 until it is safe to unref + LLSpatialGroup::sg_vector_t mMeshDirtyGroup; //groups that need rebuildMesh called U32 mMeshDirtyQueryObject; |