aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llspatialpartition.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:54 -0500
committerJacek Antonelli2008-08-15 23:45:54 -0500
commitd0b03a62fd799317d5da0bd56615739ce3b5b052 (patch)
tree8bc79bbbb52e18294f62810d9fa66ce136f90e2d /linden/indra/newview/llspatialpartition.cpp
parentSecond Life viewer sources 1.20.8 (diff)
downloadmeta-impy-d0b03a62fd799317d5da0bd56615739ce3b5b052.zip
meta-impy-d0b03a62fd799317d5da0bd56615739ce3b5b052.tar.gz
meta-impy-d0b03a62fd799317d5da0bd56615739ce3b5b052.tar.bz2
meta-impy-d0b03a62fd799317d5da0bd56615739ce3b5b052.tar.xz
Second Life viewer sources 1.20.9
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llspatialpartition.cpp22
1 files changed, 20 insertions, 2 deletions
diff --git a/linden/indra/newview/llspatialpartition.cpp b/linden/indra/newview/llspatialpartition.cpp
index 520501e..250575c 100644
--- a/linden/indra/newview/llspatialpartition.cpp
+++ b/linden/indra/newview/llspatialpartition.cpp
@@ -60,6 +60,7 @@ const F32 SG_OCCLUSION_FUDGE = 1.01f;
60 60
61static U32 sZombieGroups = 0; 61static U32 sZombieGroups = 0;
62U32 LLSpatialGroup::sNodeCount = 0; 62U32 LLSpatialGroup::sNodeCount = 0;
63BOOL LLSpatialGroup::sNoDelete = FALSE;
63 64
64static F32 sLastMaxTexPriority = 1.f; 65static F32 sLastMaxTexPriority = 1.f;
65static F32 sCurMaxTexPriority = 1.f; 66static F32 sCurMaxTexPriority = 1.f;
@@ -295,6 +296,11 @@ S32 LLSphereAABB(const LLVector3& center, const LLVector3& size, const LLVector3
295 296
296LLSpatialGroup::~LLSpatialGroup() 297LLSpatialGroup::~LLSpatialGroup()
297{ 298{
299 if (sNoDelete)
300 {
301 llerrs << "Illegal deletion of LLSpatialGroup!" << llendl;
302 }
303
298 if (isState(DEAD)) 304 if (isState(DEAD))
299 { 305 {
300 sZombieGroups--; 306 sZombieGroups--;
@@ -2619,7 +2625,10 @@ LLDrawInfo::LLDrawInfo(U16 start, U16 end, U32 count, U32 offset,
2619 2625
2620LLDrawInfo::~LLDrawInfo() 2626LLDrawInfo::~LLDrawInfo()
2621{ 2627{
2622 2628 if (LLSpatialGroup::sNoDelete)
2629 {
2630 llerrs << "LLDrawInfo deleted illegally!" << llendl;
2631 }
2623} 2632}
2624 2633
2625LLVertexBuffer* LLGeometryManager::createVertexBuffer(U32 type_mask, U32 usage) 2634LLVertexBuffer* LLGeometryManager::createVertexBuffer(U32 type_mask, U32 usage)
@@ -2813,7 +2822,16 @@ void LLCullResult::pushDrawInfo(U32 type, LLDrawInfo* draw_info)
2813} 2822}
2814 2823
2815 2824
2816 2825void LLCullResult::assertDrawMapsEmpty()
2826{
2827 for (U32 i = 0; i < LLRenderPass::NUM_RENDER_TYPES; i++)
2828 {
2829 if (mRenderMapSize[i] != 0)
2830 {
2831 llerrs << "Stale LLDrawInfo's in LLCullResult!" << llendl;
2832 }
2833 }
2834}
2817 2835
2818 2836
2819 2837