diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-05-18 09:06:46 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-05-18 09:06:46 -0400 |
| commit | bb2c147c26efad32f72fd7cdf1378824a4b0085d (patch) | |
| tree | 3da28ac9c85806fba60c924018cc34865337d09d | |
| parent | 82111ecbde4bacd4cbd5ae5d076876d0ddedd04d (diff) | |
SL-315 - fix for max/linux build failure, additional lad validation in skel_tool.py
| -rwxr-xr-x | indra/llappearance/lldriverparam.h | 1 | ||||
| -rw-r--r-- | scripts/content_tools/skel_tool.py | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/indra/llappearance/lldriverparam.h b/indra/llappearance/lldriverparam.h index 05b4f2252e..f278dcc2e2 100755 --- a/indra/llappearance/lldriverparam.h +++ b/indra/llappearance/lldriverparam.h @@ -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. diff --git a/scripts/content_tools/skel_tool.py b/scripts/content_tools/skel_tool.py index caf8070071..5d4ea0e059 100644 --- a/scripts/content_tools/skel_tool.py +++ b/scripts/content_tools/skel_tool.py @@ -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"]) |