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