summaryrefslogtreecommitdiff
path: root/indra/newview/llvieweroctree.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2013-06-24 11:44:36 -0600
committerXiaohong Bao <bao@lindenlab.com>2013-06-24 11:44:36 -0600
commit6bb64e79985f0b724dd5b07703666e307a54a98b (patch)
tree9fd53fecb74135b51339a432e6de9b6f72e04771 /indra/newview/llvieweroctree.cpp
parentfe3cfb30d504155850ddf3752d2f55e6311990d6 (diff)
parentd95d69cbc4063fae1d93ce2f0c4d22d3ef9c8edd (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llvieweroctree.cpp')
-rw-r--r--indra/newview/llvieweroctree.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llvieweroctree.cpp b/indra/newview/llvieweroctree.cpp
index d631985e82..576dbfd2c2 100644
--- a/indra/newview/llvieweroctree.cpp
+++ b/indra/newview/llvieweroctree.cpp
@@ -1022,6 +1022,11 @@ BOOL LLOcclusionCullingGroup::earlyFail(LLCamera* camera)
return TRUE;
}
+U32 LLOcclusionCullingGroup::getLastOcclusionIssuedTime()
+{
+ return mOcclusionIssued[LLViewerCamera::sCurCameraID];
+}
+
void LLOcclusionCullingGroup::checkOcclusion()
{
if (LLPipeline::sUseOcclusion > 1)