diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-08-23 12:25:49 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-08-23 12:25:49 -0600 |
| commit | 47f1da8383bb7187ae1402ce7b8fec8cd9f56a7d (patch) | |
| tree | 09d3c5ea64724053b848ff3f6a4a7fe1679bba0f /indra/newview/llvieweroctree.h | |
| parent | c95d0b884371045a46c345d43fab90b5f3d6ccb2 (diff) | |
| parent | 55df26a7bf9e141205484543cf02759f599bf521 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llvieweroctree.h')
| -rw-r--r-- | indra/newview/llvieweroctree.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llvieweroctree.h b/indra/newview/llvieweroctree.h index 7fdb5661d8..e610db96eb 100644 --- a/indra/newview/llvieweroctree.h +++ b/indra/newview/llvieweroctree.h @@ -149,8 +149,6 @@ public: virtual void setOctreeEntry(LLViewerOctreeEntry* entry); - virtual U32 getMinFrameRange()const = 0; - F32 getBinRadius() const {return mEntry->getBinRadius();} const LLVector4a* getSpatialExtents() const; LLviewerOctreeGroup* getGroup()const; @@ -327,6 +325,7 @@ public: //virtual BOOL isRecentlyVisible() const; + LLViewerOctreePartition* getSpatialPartition()const {return mSpatialPartition;} static U32 getNewOcclusionQueryObjectName(); static void releaseOcclusionQueryObjectName(U32 name); |