From 9d8986337aca6c7909a4c5ad836874d78b4625e5 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Fri, 8 Jul 2016 15:36:50 -0400
Subject: [PATCH] SL-242 - fix for slider param groups, added default args for
skel_tool.py
---
indra/newview/character/avatar_lad.xml | 10 +++++-----
scripts/content_tools/skel_tool.py | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/indra/newview/character/avatar_lad.xml b/indra/newview/character/avatar_lad.xml
index 6aef67f1b72..76a603db061 100644
--- a/indra/newview/character/avatar_lad.xml
+++ b/indra/newview/character/avatar_lad.xml
@@ -3897,7 +3897,7 @@
<param
id="30646"
- group="0"
+ group="1"
name="Egg_Head"
value_min="-1.3"
value_max="1"
@@ -4106,7 +4106,7 @@
<param
id="30119"
- group="0"
+ group="1"
name="Eyebrow Size"
value_min="0"
value_max="1"
@@ -4149,7 +4149,7 @@
<param
id="30031"
- group="0"
+ group="1"
name="Arced_Eyebrows"
value_min="0"
value_max="2"
@@ -4192,7 +4192,7 @@
<param
id="30757"
- group="0"
+ group="1"
name="Lower_Eyebrows"
value_min="-4"
value_max="2"
@@ -4235,7 +4235,7 @@
<param
id="30016"
- group="0"
+ group="1"
name="Pointy_Eyebrows"
value_min="-.5"
value_max="3">
diff --git a/scripts/content_tools/skel_tool.py b/scripts/content_tools/skel_tool.py
index f7301c55e1a..7dabadb2b85 100644
--- a/scripts/content_tools/skel_tool.py
+++ b/scripts/content_tools/skel_tool.py
@@ -366,17 +366,17 @@ def compare_skel_trees(atree,btree):
parser = argparse.ArgumentParser(description="process SL avatar_skeleton/avatar_lad files")
parser.add_argument("--verbose", action="store_true",help="verbose flag")
- parser.add_argument("--ogfile", help="specify file containing base bones")
+ parser.add_argument("--ogfile", help="specify file containing base bones", default="avatar_skeleton_orig.xml")
parser.add_argument("--ref_file", help="specify another file containing replacements for missing fields")
- parser.add_argument("--lad_file", help="specify avatar_lad file to check")
- parser.add_argument("--orig_lad_file", help="specify avatar_lad file to compare to")
+ parser.add_argument("--lad_file", help="specify avatar_lad file to check", default="avatar_lad.xml")
+ parser.add_argument("--orig_lad_file", help="specify avatar_lad file to compare to", default="avatar_lad_orig.xml")
parser.add_argument("--aliases", help="specify file containing bone aliases")
parser.add_argument("--validate", action="store_true", help="check specified input file for validity")
parser.add_argument("--fix", action="store_true", help="try to correct errors")
parser.add_argument("--remove", nargs="+", help="remove specified joints")
parser.add_argument("--list", action="store_true", help="list joint names")
parser.add_argument("--compare", help="alternate skeleton file to compare")
- parser.add_argument("infilename", help="name of a skel .xml file to input")
+ parser.add_argument("infilename", help="name of a skel .xml file to input", default="avatar_skeleton.xml")
parser.add_argument("outfilename", nargs="?", help="name of a skel .xml file to output")
args = parser.parse_args()
--
GitLab