summaryrefslogtreecommitdiff
path: root/indra/newview/llvovolume.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2017-06-09 21:13:54 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2017-06-09 21:13:54 +0100
commitc5dc0ee36e8d17fd0cf25f5a1fbdfb8609a64ee0 (patch)
tree8efb79ca33fda8b29fd46dbdfc44d9d8a6231d3e /indra/newview/llvovolume.cpp
parentc9baf4c66157c601cc4d4e325c7843b3bf9a0cad (diff)
SL-704 - code cleanup
Diffstat (limited to 'indra/newview/llvovolume.cpp')
-rw-r--r--indra/newview/llvovolume.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index a2f417a5cc..59e1895bc6 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -3308,7 +3308,7 @@ void LLVOVolume::setExtendedMeshFlags(U32 flags)
}
}
-bool LLVOVolume::canBeAnimatedMesh() const
+bool LLVOVolume::canBeAnimatedObject() const
{
if (!isMesh())
{
@@ -3322,9 +3322,9 @@ bool LLVOVolume::canBeAnimatedMesh() const
return true;
}
-bool LLVOVolume::isAnimatedMesh() const
+bool LLVOVolume::isAnimatedObject() const
{
- return canBeAnimatedMesh() && (getExtendedMeshFlags() & LLExtendedMeshParams::ANIMATED_MESH_ENABLED_FLAG);
+ return canBeAnimatedObject() && (getExtendedMeshFlags() & LLExtendedMeshParams::ANIMATED_MESH_ENABLED_FLAG);
}
//----------------------------------------------------------------------------
@@ -4850,11 +4850,11 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
bool bake_sunlight = LLPipeline::sBakeSunlight && drawablep->isStatic();
- // TRIF why this variable? Only different from rigged if
+ // AXON why this variable? Only different from rigged if
// there are no LLFaces associated with the drawable.
bool is_rigged = false;
- // TRIF handle NPC case
+ // AXON handle NPC case
if (rigged && pAvatarVO)
{
pAvatarVO->addAttachmentOverridesForObject(vobj);