diff options
author | McCabe Maxsted | 2010-05-01 03:32:22 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-09-25 08:15:11 -0700 |
commit | 88c0a4d7be265784aeb6010e42df8632dbf8f88b (patch) | |
tree | d7b65d6f12ae42c84173cd889707012e960d13d6 /linden/indra/newview/llspatialpartition.h | |
parent | Fixed Windows compile bug in 721c25d8. Changed std::max to llmax since Window... (diff) | |
download | meta-impy-88c0a4d7be265784aeb6010e42df8632dbf8f88b.zip meta-impy-88c0a4d7be265784aeb6010e42df8632dbf8f88b.tar.gz meta-impy-88c0a4d7be265784aeb6010e42df8632dbf8f88b.tar.bz2 meta-impy-88c0a4d7be265784aeb6010e42df8632dbf8f88b.tar.xz |
Applied patch by Aleric Inglewood for VWR-12984: Water flickers and disappears in patches, part 1
Diffstat (limited to 'linden/indra/newview/llspatialpartition.h')
-rw-r--r-- | linden/indra/newview/llspatialpartition.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/linden/indra/newview/llspatialpartition.h b/linden/indra/newview/llspatialpartition.h index df96152..be0163b 100644 --- a/linden/indra/newview/llspatialpartition.h +++ b/linden/indra/newview/llspatialpartition.h | |||
@@ -481,7 +481,6 @@ private: | |||
481 | drawinfo_list_t mRenderMap[LLRenderPass::NUM_RENDER_TYPES]; | 481 | drawinfo_list_t mRenderMap[LLRenderPass::NUM_RENDER_TYPES]; |
482 | }; | 482 | }; |
483 | 483 | ||
484 | |||
485 | //spatial partition for water (implemented in LLVOWater.cpp) | 484 | //spatial partition for water (implemented in LLVOWater.cpp) |
486 | class LLWaterPartition : public LLSpatialPartition | 485 | class LLWaterPartition : public LLSpatialPartition |
487 | { | 486 | { |
@@ -491,6 +490,13 @@ public: | |||
491 | virtual void addGeometryCount(LLSpatialGroup* group, U32 &vertex_count, U32& index_count) { } | 490 | virtual void addGeometryCount(LLSpatialGroup* group, U32 &vertex_count, U32& index_count) { } |
492 | }; | 491 | }; |
493 | 492 | ||
493 | //spatial partition for hole and edge water (implemented in LLVOWater.cpp) | ||
494 | class LLVoidWaterPartition : public LLWaterPartition | ||
495 | { | ||
496 | public: | ||
497 | LLVoidWaterPartition(); | ||
498 | }; | ||
499 | |||
494 | //spatial partition for terrain (impelmented in LLVOSurfacePatch.cpp) | 500 | //spatial partition for terrain (impelmented in LLVOSurfacePatch.cpp) |
495 | class LLTerrainPartition : public LLSpatialPartition | 501 | class LLTerrainPartition : public LLSpatialPartition |
496 | { | 502 | { |