livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-315 - fix for max/linux build failure, additional lad validation in skel_tool.py

meow-7.2.2
Brad Payne (Vir Linden) 2016-05-18 09:06:46 -04:00
parent 82111ecbde
commit bb2c147c26
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llappearance/lldriverparam.h
View File

@ -139,7 +139,6 @@ protected:
LL_ALIGN_16(LLVector4a mDefaultVec); // temp holder
typedef std::vector<LLDrivenEntry> entry_list_t;
entry_list_t mDriven;
LLViewerVisualParam* mCurrentDistortionParam;
// Backlink only; don't make this an LLPointer.

7
scripts/content_tools/skel_tool.py
View File

@ -261,9 +261,15 @@ def validate_lad_tree(ladtree,skeltree,orig_ladtree):
driver = driven_param.getparent().getparent()
driven_id = driven_param.get("id")
driver_id = driver.get("id")
actual_param = next(param for param in ladtree.iter("param") if param.get("id")==driven_id)
if not driven_id in drivers:
drivers[driven_id] = set()
drivers[driven_id].add(driver_id)
if (actual_param.get("value_min") != driver.get("value_min") or \
actual_param.get("value_max") != driver.get("value_max")):
if args.verbose:
print "MISMATCH min max:",driver.get("id"),"drives",driven_param.get("id"),"min",driver.get("value_min"),actual_param.get("value_min"),"max",driver.get("value_max"),actual_param.get("value_max")
for driven_id in drivers:
dset = drivers[driven_id]
if len(dset) != 1:
@ -271,7 +277,6 @@ def validate_lad_tree(ladtree,skeltree,orig_ladtree):
else:
if args.verbose:
print "driven_id",driven_id,"has one driver",dset
if orig_ladtree:
# make sure expected message format is unchanged
orig_message_params_by_id = dict((int(param.get("id")),param) for param in orig_ladtree.iter("param") if param.get("group") in ["0","3"])