diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-06-21 10:21:52 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-06-21 10:21:52 -0700 |
| commit | c8970618567e867b619c9fb5e225978bc5f66781 (patch) | |
| tree | d5ec9d2f27d887e9a39b1109469ca405b14c6a85 /indra/newview/lldrawable.cpp | |
| parent | 6be9f280ff5b2e2eba3bb9c3f14d7166579d1a49 (diff) | |
| parent | a069e0d3db0e0771e54768a702fa18e57415992e (diff) | |
Merge with q/viewer-release
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 38eda5bd2e..3f9d3fdbef 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -1366,10 +1366,11 @@ void LLSpatialBridge::move(LLDrawable *drawablep, LLSpatialGroup *curp, BOOL imm BOOL LLSpatialBridge::updateMove() { - llassert(mDrawable); - llassert(mDrawable->getRegion()); + llassert_always(mDrawable); + llassert_always(mDrawable->mVObjp); + llassert_always(mDrawable->getRegion()); LLSpatialPartition* part = mDrawable->getRegion()->getSpatialPartition(mPartitionType); - llassert(part); + llassert_always(part); mOctree->balance(); if (part) |