diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-24 14:02:51 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-24 14:02:51 +0200 |
| commit | 1ef3fed827d7bcc901fc6e000033e45925f09b5c (patch) | |
| tree | 7f282a0b2b828ea5f04d6c62b513c022f4071a1b /indra/newview/lldrawable.cpp | |
| parent | 172d9b21ab26927ec35a9210c4e9ce2ec24c9509 (diff) | |
| parent | a7bca7055adbceee0fe09a6078158ffe8d0eacef (diff) | |
Merge from default branch
--HG--
branch : product-engine
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) { |