summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawable.cpp
diff options
context:
space:
mode:
authorPalmer Truelson <palmer@lindenlab.com>2010-02-12 21:06:02 -0800
committerPalmer Truelson <palmer@lindenlab.com>2010-02-12 21:06:02 -0800
commit1f672990e796ec55f7b684dbf46f939d1ab15607 (patch)
tree24435fc8f74b331277afe9cafc60d7e7dcfccabf /indra/newview/lldrawable.cpp
parent8e67ecf3dcd5f168806389a1048b2632582feedb (diff)
Backed out davep's optimization pass. changeset 3c3685de430a
Diffstat (limited to 'indra/newview/lldrawable.cpp')
-rw-r--r--indra/newview/lldrawable.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 244fed791f..d60330024a 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)
{