summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2016-05-06 10:17:56 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2016-05-06 10:17:56 -0400
commite0cb5438a5055c71191c6ae6b27c7dee63e40562 (patch)
treecd8c03b4ec61759454c9965f8b68f0d004eb5978 /indra
parent393072b9d62137a58660d9db787a20b42746c457 (diff)
SL-315 - notes on resetSkeleton()
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llvoavatar.cpp17
1 files changed, 16 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 679ea88a44..d44c7f56f2 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -1808,16 +1808,24 @@ void LLVOAvatar::resetSkeleton()
{
LL_DEBUGS("Avatar") << avString() << LL_ENDL;
- // Reset params
+ // Stop all animations
+
+ // Clear all attachment pos overrides
+
+ // Preserve state of tweakable params
+
+ // Reset all params to default state, without propagating changes downstream.
for (LLVisualParam *param = getFirstVisualParam();
param;
param = getNextVisualParam())
{
+#if 0
if (param->isAnimating())
{
continue;
}
param->setLastWeight(param->getDefaultWeight());
+#endif
}
// Reset all bones and collision volumes to their initial skeleton state.
@@ -1826,8 +1834,15 @@ void LLVOAvatar::resetSkeleton()
LL_ERRS() << "Error resetting skeleton" << LL_ENDL;
}
+ // Reset tweakable params to preserved state
// Apply params
+#if 0
updateVisualParams();
+#endif
+
+ // Restore attachment pos overrides
+
+ // Restart animations
}
//-----------------------------------------------------------------------------