summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-10 18:43:13 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-10 18:43:13 +0000
commiteeb480085809978c8711242d30b660a80ced123b (patch)
treec6243e834be0574aef3d3a3fefa6200f7c58c58d
parentcd627804576a3b58377ec6cca31837cc556939d4 (diff)
CID-130
Checker: NULL_RETURNS Function: LLSpatialBridge::LLSpatialBridge(LLDrawable *, int, unsigned int) File: /indra/newview/lldrawable.cpp
-rw-r--r--indra/newview/lldrawable.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index f38c92abb5..9fbc3408d7 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -1049,9 +1049,13 @@ LLSpatialBridge::LLSpatialBridge(LLDrawable* root, BOOL render_by_group, U32 dat
llassert(mDrawable);
llassert(mDrawable->getRegion());
- llassert(mDrawable->getRegion()->getSpatialPartition(mPartitionType));
+ LLSpatialPartition *part = mDrawable->getRegion()->getSpatialPartition(mPartitionType);
+ llassert(part);
- mDrawable->getRegion()->getSpatialPartition(mPartitionType)->put(this);
+ if (part)
+ {
+ part->put(this);
+ }
}
LLSpatialBridge::~LLSpatialBridge()