summaryrefslogtreecommitdiff
path: root/indra/newview/llcontrolavatar.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2017-12-11 21:18:05 +0000
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2017-12-11 21:18:05 +0000
commit6199cecd8bd40e9929f1863fcfa8220ccf9fdf3b (patch)
treef0d3fd92ca654b3f2e40c804e85c023adf2939cb /indra/newview/llcontrolavatar.cpp
parentef264fd82e48a376db3c31323b3fcffe4d9c32b4 (diff)
SL-704 - more comment review/cleanup, some avatar state handling updated for animated objects.
Diffstat (limited to 'indra/newview/llcontrolavatar.cpp')
-rw-r--r--indra/newview/llcontrolavatar.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index 0f4898e8d3..9b7118d9cb 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -113,7 +113,7 @@ void LLControlAvatar::setGlobalScale(F32 scale)
{
F32 adjust_scale = scale/mGlobalScale;
LL_INFOS() << "scale " << scale << " adjustment " << adjust_scale << LL_ENDL;
- // AXON - should we be scaling from the pelvis or the root?
+ // should we be scaling from the pelvis or the root?
recursiveScaleJoint(mPelvisp,adjust_scale);
mGlobalScale = scale;
}
@@ -167,7 +167,10 @@ void LLControlAvatar::updateVolumeGeom()
matchVolumeTransform();
- // AXON testing scale
+ // Initial exploration of allowing scaling skeleton to match root
+ // prim bounding box. If enabled, would probably be controlled by
+ // an additional checkbox and default to off. Not enabled for
+ // initial release.
// What should the scale be? What we really want is the ratio
// between the scale at which the object was originally designed