diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-25 09:26:28 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-25 09:26:28 -0400 |
| commit | 66cac05cfb1236c3c1607dff27babf873c29a679 (patch) | |
| tree | 64a5eee7cf984098a5614563a9f5ad49b520fa17 /indra/newview/llspatialpartition.h | |
| parent | bf906ac9264e21d622e4ce867c40dd53a0da6013 (diff) | |
| parent | 2434a39c252ce895e7c659f42c54b9142ad859c2 (diff) | |
merge changes for storm-1570
Diffstat (limited to 'indra/newview/llspatialpartition.h')
| -rw-r--r-- | indra/newview/llspatialpartition.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h index 54d5d36f6e..11955540c6 100644 --- a/indra/newview/llspatialpartition.h +++ b/indra/newview/llspatialpartition.h @@ -282,6 +282,7 @@ public: LLSpatialGroup(OctreeNode* node, LLSpatialPartition* part); + BOOL isHUDGroup() ; BOOL isDead() { return isState(DEAD); } BOOL isState(U32 state) const; BOOL isOcclusionState(U32 state) const { return mOcclusionState[LLViewerCamera::sCurCameraID] & state ? TRUE : FALSE; } @@ -470,6 +471,7 @@ public: S32 cull(LLCamera &camera, std::vector<LLDrawable *>* results = NULL, BOOL for_select = FALSE); // Cull on arbitrary frustum BOOL isVisible(const LLVector3& v); + bool isHUDPartition() ; virtual LLSpatialBridge* asBridge() { return NULL; } virtual BOOL isBridge() { return asBridge() != NULL; } |