diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-24 17:04:48 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-24 17:04:48 -0800 |
| commit | 6bb43e1369d957a041c796120e87a89ff3fa10ee (patch) | |
| tree | 678e25f3b62ab90e2940dfcae5feafa1acaa8ffc /indra/newview/llvoavatar.cpp | |
| parent | ff52ac089f9ed67410f80fe66d0b997f0f2dafcc (diff) | |
| parent | fc633fce71c6bdd43ab009558c7556f528335fe0 (diff) | |
Automated merge up from viewer 2.0 trunk.
Some llvoiceclient changes duplicated changes that had already been
made in the voice modularization refactor, so the refactor versions
were used.
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 341ea91c6d..863f40309d 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -2535,6 +2535,7 @@ void LLVOAvatar::idleUpdateLoadingEffect() if (isFullyLoaded()) { deleteParticleSource(); + updateLOD(); } else { @@ -6822,7 +6823,7 @@ void LLVOAvatar::useBakedTexture( const LLUUID& id ) local_tex_iter != baked_dict->mLocalTextures.end(); ++local_tex_iter) { - setBakedReady(*local_tex_iter, TRUE); + if (isSelf()) setBakedReady(*local_tex_iter, TRUE); } // ! BACKWARDS COMPATIBILITY ! |