summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawable.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-01-19 23:24:13 -0600
committerDave Parks <davep@lindenlab.com>2011-01-19 23:24:13 -0600
commit1b2c082feb91b4837a0cb5652d1668f6582e9bc9 (patch)
tree32179a4a46c263fbb73a9f9c727a6647841e79a5 /indra/newview/lldrawable.cpp
parent17068766b75fbe7dac968705f4f383fb61f73eb4 (diff)
parent32c4a448b113731a8c9ae32613fe4aa50b5c9997 (diff)
merge
Diffstat (limited to 'indra/newview/lldrawable.cpp')
-rw-r--r--indra/newview/lldrawable.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 086702de87..73c4cf94ef 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -763,7 +763,7 @@ void LLDrawable::updateTexture()
if (getVOVolume())
{
- if (isActive())
+ /*if (isActive())
{
if (isRoot())
{
@@ -773,7 +773,7 @@ void LLDrawable::updateTexture()
{
getParent()->mQuietCount = 0;
}
- }
+ }*/
gPipeline.markRebuild(this, LLDrawable::REBUILD_MATERIAL, TRUE);
}