diff options
| author | Palmer Truelson <palmer@lindenlab.com> | 2010-02-23 17:07:18 -0800 |
|---|---|---|
| committer | Palmer Truelson <palmer@lindenlab.com> | 2010-02-23 17:07:18 -0800 |
| commit | 0980df1e0ce99bdafdd4e806cbacad96c71729cc (patch) | |
| tree | 20a76a1b07928ac9aa9453765b5c4a92b0b318c7 /indra/newview/lldrawable.cpp | |
| parent | 187acf0c3af6d5fee301137a49993fbc75039f38 (diff) | |
| parent | da79eb5545ae0604bad357d71b54e2381fc480e8 (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) { |