diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-12-01 14:15:34 +0000 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-12-01 14:15:34 +0000 |
| commit | 0d2d6b42baa4fc6d253c5499324ffe5572676d87 (patch) | |
| tree | 4583dbbd90ca376c7517126758fffdeccfc23dd6 /indra/newview/llcontrolavatar.cpp | |
| parent | 5c7f27562dc1ef449f23be5ab747a19c23eec361 (diff) | |
SL-704, SL-759 - support for impostoring of animated objects, comment and code cleanup
Diffstat (limited to 'indra/newview/llcontrolavatar.cpp')
| -rw-r--r-- | indra/newview/llcontrolavatar.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp index 7e89a97c03..920b0fa151 100644 --- a/indra/newview/llcontrolavatar.cpp +++ b/indra/newview/llcontrolavatar.cpp @@ -52,7 +52,7 @@ LLControlAvatar::~LLControlAvatar() // virtual void LLControlAvatar::initInstance() { - // AXON - potential optimizations here: avoid creating system + // Potential optimizations here: avoid creating system // avatar mesh content since it's not used. For now we just clean some // things up after the fact in releaseMeshData(). LLVOAvatar::initInstance(); @@ -280,10 +280,11 @@ void LLControlAvatar::updateDebugText() type_string += "-"; } } - addDebugText(llformat("CAV obj %d anim %d active %s", - total_linkset_count, animated_volume_count, active_string.c_str())); + addDebugText(llformat("CAV obj %d anim %d active %s impost %d", + total_linkset_count, animated_volume_count, active_string.c_str(), (S32) isImpostor())); addDebugText(llformat("types %s lods %s", type_string.c_str(), lod_string.c_str())); addDebugText(llformat("tris %d verts %d", total_tris, total_verts)); + addDebugText(llformat("pxarea %s", LLStringOps::getReadableNumber(getPixelArea()).c_str())); std::string region_name = "no region"; if (mRootVolp->getRegion()) { @@ -335,7 +336,7 @@ void LLControlAvatar::updateAnimations() { if (!mRootVolp) { - LL_WARNS_ONCE("AXON") << "No root vol" << LL_ENDL; + LL_WARNS_ONCE("AnimatedObjects") << "No root vol" << LL_ENDL; return; } |