diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-08-22 15:48:21 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-08-22 15:48:21 -0600 |
| commit | cdf5a1e1cc98950d89f78df60207bfd56df24178 (patch) | |
| tree | d79e11fd00602cbda625b14c70ac805bfc2795c0 /indra/newview/llvieweroctree.h | |
| parent | cf014375b8b408d58bd35deb4e58e4369fb3bf62 (diff) | |
| parent | 7b5618aeaeb4df31bd3f9436e067b26fb5be866b (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); |