diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-02-08 11:56:18 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-02-08 11:56:18 -0600 |
| commit | 9bd192d8b7ed5ea4a95bfa5cb6dd8163b8bcd298 (patch) | |
| tree | f4d964eb140b8bc175ee5cde2b555f93de9b594b /indra/newview/lldrawable.cpp | |
| parent | ac59a7c130f3fcbbb8f228bdf69c44ffa09f07a2 (diff) | |
| parent | 42df75bafeab49b408f23d79feb4f2213d2560eb (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 d60330024a..244fed791f 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) { |