diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-09-12 16:41:48 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-09-12 16:41:48 -0600 |
| commit | 75f5efff9bc29380bae5a3febd5e2bd169aaff79 (patch) | |
| tree | 8561fd94629488c247395745585cacc286225bd0 /indra/newview/llvieweroctree.h | |
| parent | 420a1af0c86113a7db291022373b69c2b8810c7c (diff) | |
| parent | 605060ea022670f4ff6f8850f79495032095b58e (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llvieweroctree.h')
| -rw-r--r-- | indra/newview/llvieweroctree.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvieweroctree.h b/indra/newview/llvieweroctree.h index 97dc1d4a0a..bc3c7cbfa2 100644 --- a/indra/newview/llvieweroctree.h +++ b/indra/newview/llvieweroctree.h @@ -314,7 +314,7 @@ public: void setOcclusionState(U32 state, S32 mode = STATE_MODE_SINGLE); void clearOcclusionState(U32 state, S32 mode = STATE_MODE_SINGLE); void checkOcclusion(); //read back last occlusion query (if any) - void doOcclusion(LLCamera* camera, const LLVector3* region_agent = NULL); //issue occlusion query + void doOcclusion(LLCamera* camera, const LLVector4a* shift = NULL); //issue occlusion query BOOL isOcclusionState(U32 state) const { return mOcclusionState[LLViewerCamera::sCurCameraID] & state ? TRUE : FALSE; } BOOL needsUpdate(); |