diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-11-14 11:19:33 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-11-14 11:19:33 -0800 |
| commit | 1d022e86c84039f88c531e91ce857666acd224a1 (patch) | |
| tree | 9a8ba45529cb125a2ae5cd4672b3fd093af9b45c /indra/newview/llavatarrenderinfoaccountant.cpp | |
| parent | 18eb4b497fd890118e7da78dcc2eda4bd84c4ede (diff) | |
| parent | 34770cbf2ef34b7901552057a0823e502d42be1d (diff) | |
Merge
Diffstat (limited to 'indra/newview/llavatarrenderinfoaccountant.cpp')
| -rw-r--r-- | indra/newview/llavatarrenderinfoaccountant.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/newview/llavatarrenderinfoaccountant.cpp b/indra/newview/llavatarrenderinfoaccountant.cpp index 7c7f55f68c..ca83afb5ab 100644 --- a/indra/newview/llavatarrenderinfoaccountant.cpp +++ b/indra/newview/llavatarrenderinfoaccountant.cpp @@ -112,8 +112,13 @@ void LLAvatarRenderInfoAccountant::avatarRenderInfoGetCoro(std::string url, U64 ) { LLUUID target_agent_id = LLUUID(agent_iter->first); - LLViewerObject* avatarp = gObjectList.findObject(target_agent_id); - if (avatarp && avatarp->isAvatar()) + LLViewerObject* vobjp = gObjectList.findObject(target_agent_id); + LLVOAvatar *avatarp = NULL; + if (vobjp) + { + avatarp = vobjp->asAvatar(); + } + if (avatarp && !avatarp->isControlAvatar()) { const LLSD & agent_info_map = agent_iter->second; if (agent_info_map.isMap()) @@ -123,7 +128,7 @@ void LLAvatarRenderInfoAccountant::avatarRenderInfoGetCoro(std::string url, U64 if (agent_info_map.has(KEY_WEIGHT)) { - ((LLVOAvatar *) avatarp)->setReportedVisualComplexity(agent_info_map[KEY_WEIGHT].asInteger()); + avatarp->setReportedVisualComplexity(agent_info_map[KEY_WEIGHT].asInteger()); } } else @@ -201,6 +206,7 @@ void LLAvatarRenderInfoAccountant::avatarRenderInfoReportCoro(std::string url, U if (avatar && avatar->getRezzedStatus() >= 2 && // Mostly rezzed (maybe without baked textures downloaded) !avatar->isDead() && // Not dead yet + !avatar->isControlAvatar() && // Not part of an animated object avatar->getObjectHost() == regionp->getHost()) // Ensure it's on the same region { avatar->calculateUpdateRenderComplexity(); // Make sure the numbers are up-to-date |