summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2018-12-06 21:58:14 +0000
committerAndrey Lihatskiy <alihatskiy@productengine.com>2022-05-18 23:30:02 +0300
commit307db06310d6d3dc5a38da5543d0f074266fb12a (patch)
tree182de4acbaaa3603fd638622a2c9fc18760e500c /scripts
parent4413f9be879c14328988ce4d285c1dfa263db027 (diff)
SL-10163 - allow joint aliases in animation uploads. Names are canonicalized before sending to simulator.
# Conflicts: # indra/newview/llviewerassetupload.cpp # indra/newview/llvoavatar.cpp # scripts/content_tools/anim_tool.py
Diffstat (limited to 'scripts')
-rw-r--r--scripts/content_tools/anim_tool.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/content_tools/anim_tool.py b/scripts/content_tools/anim_tool.py
index e7b86a88fa..205fc2b6e1 100644
--- a/scripts/content_tools/anim_tool.py
+++ b/scripts/content_tools/anim_tool.py
@@ -637,6 +637,7 @@ def main(*argv):
parser.add_argument("--no_hud", help="omit hud joints from list of attachments", action="store_true")
parser.add_argument("--base_priority", help="set base priority", type=int)
parser.add_argument("--joint_priority", help="set joint priority for all joints", type=int)
+ parser.add_argument("--force_joints", help="don't check validity of joint names", action="store_true")
parser.add_argument("infilename", help="name of a .anim file to input")
parser.add_argument("outfilename", nargs="?", help="name of a .anim file to output")
args = parser.parse_args(argv)
@@ -661,7 +662,12 @@ def main(*argv):
if lad_tree is None:
raise Error("failed to parse " + args.lad)
if args.joints:
- joints = resolve_joints(args.joints, skel_tree, lad_tree, args.no_hud)
+ if args.force_joints:
+ joints = args.joints
+ else:
+ joints = resolve_joints(args.joints, skel_tree, lad_tree, args.no_hud)
+ if args.use_aliases:
+ joints = map(lambda name: "avatar_" + name, joints)
if args.verbose:
print("joints resolved to",joints)
for name in joints: