summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2017-11-16 20:33:11 +0000
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2017-11-16 20:33:11 +0000
commitb625f9cd9956d135760da0053e46cf01692779c5 (patch)
treea6a13064f8c499fda75a954560f88d4281b90388 /indra/newview
parent6e75ceeff3b145c159f23e3a24576d0622ee4e1d (diff)
SL-763 - disabling the use_quantum optimization in LLMotionController until it can be fixed.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llcontrolavatar.cpp5
-rw-r--r--indra/newview/llvoavatar.cpp5
2 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llcontrolavatar.cpp b/indra/newview/llcontrolavatar.cpp
index 7600bc6959..7e89a97c03 100644
--- a/indra/newview/llcontrolavatar.cpp
+++ b/indra/newview/llcontrolavatar.cpp
@@ -52,8 +52,9 @@ LLControlAvatar::~LLControlAvatar()
// virtual
void LLControlAvatar::initInstance()
{
- // AXON - potential optimizations here - avoid creating system
- // avatar mesh since it's not used.
+ // AXON - 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();
}
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index b1ae7f543a..1eddf92df9 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3896,8 +3896,11 @@ void LLVOAvatar::updateTimeStep()
stopMotion(ANIM_AGENT_WALK_ADJUST);
removeAnimationData("Walk Speed");
}
- // AXON: see SL-763 - playback with altered time step does not
+ // See SL-763 - playback with altered time step does not
// appear to work correctly, odd behavior for distant avatars.
+ // As of 11-2017, LLMotionController::updateMotions() will
+ // ignore the value here. Need to re-enable if it's every
+ // fixed.
mMotionController.setTimeStep(time_step);
}