summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2011-02-23 17:21:54 -0500
committerNyx (Neal Orman) <nyx@lindenlab.com>2011-02-23 17:21:54 -0500
commit77fff26431671ffef8cf482044b1fcd98262d3e0 (patch)
treee321e8425ff03bfb9b06fcab0296bf067ea46f89 /indra/newview
parentd06cab548d7e4daa7a120692f64c10c05927143f (diff)
suppressing particles in overly complex avatars when clouding - they should appear as white spheres.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llvoavatar.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index be65af1e71..7dadf34a2a 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -2716,7 +2716,10 @@ void LLVOAvatar::idleUpdateLoadingEffect()
LLPartData::LL_PART_EMISSIVE_MASK | // LLPartData::LL_PART_FOLLOW_SRC_MASK |
LLPartData::LL_PART_TARGET_POS_MASK );
- setParticleSource(particle_parameters, getID());
+ if (!isTooComplex()) // do not generate particles for overly-complex avatars
+ {
+ setParticleSource(particle_parameters, getID());
+ }
}
}
}