diff options
| author | Palmer Truelson <palmer@lindenlab.com> | 2010-02-12 21:06:25 -0800 |
|---|---|---|
| committer | Palmer Truelson <palmer@lindenlab.com> | 2010-02-12 21:06:25 -0800 |
| commit | 3b8463f0fd5f0b2cd54840c34a7a7e303954f768 (patch) | |
| tree | a8c303cc592266109b368a4ae6093e8d2c3cf10f /indra/newview/lldrawable.cpp | |
| parent | 660c3b182c12ce0842334127782abc7c3cfba860 (diff) | |
| parent | 1f672990e796ec55f7b684dbf46f939d1ab15607 (diff) | |
merge
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 38eda5bd2e..9fbc3408d7 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -386,6 +386,8 @@ void LLDrawable::makeActive() mParent->makeActive(); } + gPipeline.setActive(this, TRUE); + //all child objects must also be active llassert_always(mVObjp); @@ -432,6 +434,7 @@ void LLDrawable::makeStatic(BOOL warning_enabled) if (isState(ACTIVE)) { clearState(ACTIVE); + gPipeline.setActive(this, FALSE); if (mParent.notNull() && mParent->isActive() && warning_enabled) { |