diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 18:31:34 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 18:31:34 +0000 |
| commit | b7b2d2b3ee097a4c7c7bc689538a5e0707c2978a (patch) | |
| tree | d638ee67907098956021ecece48117bb385b2494 /indra/newview | |
| parent | 2bc74a4e99b31023bce390198d3a2d5f0b835829 (diff) | |
CID-152
Checker: NULL_RETURNS
Function: LLSpatialBridge::updateMove()
File: /indra/newview/lldrawable.cpp
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index d60330024a..f38c92abb5 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -1367,10 +1367,14 @@ BOOL LLSpatialBridge::updateMove() { llassert(mDrawable); llassert(mDrawable->getRegion()); - llassert(mDrawable->getRegion()->getSpatialPartition(mPartitionType)); + LLSpatialPartition* part = mDrawable->getRegion()->getSpatialPartition(mPartitionType); + llassert(part); mOctree->balance(); - mDrawable->getRegion()->getSpatialPartition(mPartitionType)->move(this, getSpatialGroup(), TRUE); + if (part) + { + part->move(this, getSpatialGroup(), TRUE); + } return TRUE; } |