diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-08-28 17:28:19 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-08-28 17:28:19 -0600 |
| commit | 126a977bf824f2b9fe130186b592f3be747a09b6 (patch) | |
| tree | b9a8abaf5c50822094e53dddd8b55f47588b47a1 /indra/newview/llvocache.cpp | |
| parent | b1297dce44ccf4b4875ec9ce0d9d78d563d877ee (diff) | |
| parent | edd1478cc0ba240d428fc4c35f9c97af7d2ce346 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llvocache.cpp')
| -rwxr-xr-x | indra/newview/llvocache.cpp | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp index dc7b907a35..dcd1ae391d 100755 --- a/indra/newview/llvocache.cpp +++ b/indra/newview/llvocache.cpp @@ -286,18 +286,6 @@ void LLVOCacheEntry::removeAllChildren() mChildrenList.clear(); } -LLDataPackerBinaryBuffer *LLVOCacheEntry::getDP(U32 crc) -{ - if ( (mCRC != crc) - ||(mDP.getBufferSize() == 0)) - { - //LL_INFOS() << "Not getting cache entry, invalid!" << LL_ENDL; - return NULL; - } - mHitCount++; - return &mDP; -} - LLDataPackerBinaryBuffer *LLVOCacheEntry::getDP() { if (mDP.getBufferSize() == 0) @@ -638,10 +626,10 @@ S32 LLVOCachePartition::cull(LLCamera &camera, bool do_occlusion) } mCulledTime[LLViewerCamera::sCurCameraID] = LLViewerOctreeEntryData::getCurrentFrame(); - //if(!mDirty && !mCullHistory[LLViewerCamera::sCurCameraID] && LLViewerRegion::isViewerCameraStatic()) - //{ - // return 0; //nothing changed, skip culling - //} + if(!mDirty && !mCullHistory[LLViewerCamera::sCurCameraID] && LLViewerRegion::isViewerCameraStatic()) + { + return 0; //nothing changed, skip culling + } ((LLviewerOctreeGroup*)mOctree->getListener(0))->rebound(); mCullHistory[LLViewerCamera::sCurCameraID] <<= 1; |