diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-03-09 01:09:20 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-03-09 01:09:20 +0000 |
| commit | b36dc363061ec5bf6b092c14193198e9a5eef816 (patch) | |
| tree | b067586bd545dfa6dce9dd0b1243b9c0aa143f33 /indra/newview/llspatialpartition.h | |
| parent | 6fa974fc64b172a7324b28d40f08f2a861d87f8d (diff) | |
svn merge -r 58902:58986 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/llspatialpartition.h')
| -rw-r--r-- | indra/newview/llspatialpartition.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h index ea0802985e..6a795d4c6c 100644 --- a/indra/newview/llspatialpartition.h +++ b/indra/newview/llspatialpartition.h @@ -173,6 +173,7 @@ public: BOOL boundObjects(BOOL empty, LLVector3& newMin, LLVector3& newMax); void unbound(); BOOL rebound(); + void destroyGL(); void updateDistance(LLCamera& camera); BOOL changeLOD(); @@ -273,6 +274,8 @@ public: BOOL isVolatile() const { return mVolatile; } virtual LLSpatialBridge* asBridge() { return NULL; } + virtual BOOL isBridge() { return asBridge() != NULL; } + S32 getObjects(const LLVector3& pos, F32 rad, LLDrawable::drawable_set_t &results ); S32 getLights(const LLVector3& pos, F32 rad, LLDrawable::drawable_set_t &results ); |