diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-09 20:59:38 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-09 20:59:38 +0000 |
| commit | bc1df4b1db40f2cff98b4002f3f2d3a723c84be5 (patch) | |
| tree | 2b704bb91f4f039e241f40eb56b7d8352fffb8ba /indra/newview/llviewerobject.cpp | |
| parent | 8bed0558f538f7dfb8875e418f20c9d9da93ae17 (diff) | |
Fix a whole bunch of compilation warnings reported by gcc 4.4
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 6591cd3b19..8e8f882d75 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -637,8 +637,8 @@ BOOL LLViewerObject::setDrawableParent(LLDrawable* parentp) BOOL ret = mDrawable->mXform.setParent(parentp ? &parentp->mXform : NULL); gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, TRUE); - if( old_parent != parentp && - old_parent || (parentp && parentp->isActive())) + if( (old_parent != parentp && old_parent) + || (parentp && parentp->isActive())) { // *TODO we should not be relying on setDrawable parent to call markMoved gPipeline.markMoved(mDrawable, FALSE); |