diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-10-01 11:05:29 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-10-01 11:05:29 -0400 |
| commit | ebad0c6868b924ba607a1b2256ae7621cab62bf4 (patch) | |
| tree | 76da7036c250158a3907b613f7ef89c66c5d3366 /indra/llprimitive/lldaeloader.h | |
| parent | fc74e02cde9b7b31de157f23a8bd9bf27a756428 (diff) | |
DRTVWR-412 WIP - more work for importer merge from viewer-release
Diffstat (limited to 'indra/llprimitive/lldaeloader.h')
| -rw-r--r-- | indra/llprimitive/lldaeloader.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/llprimitive/lldaeloader.h b/indra/llprimitive/lldaeloader.h index 7d91a6063b..896451320c 100644 --- a/indra/llprimitive/lldaeloader.h +++ b/indra/llprimitive/lldaeloader.h @@ -47,15 +47,16 @@ public: dae_model_map mModelsMap; LLDAELoader( - std::string filename, - S32 lod, + std::string filename, + S32 lod, LLModelLoader::load_callback_t load_cb, LLModelLoader::joint_lookup_func_t joint_lookup_func, LLModelLoader::texture_load_func_t texture_load_func, LLModelLoader::state_callback_t state_cb, - void* opaque_userdata, - JointTransformMap& jointMap, - JointSet& jointsFromNodes, + void* opaque_userdata, + JointTransformMap& jointTransformMap, + JointNameSet& jointsFromNodes, + JointNameSet& legalJointNames, U32 modelLimit); virtual ~LLDAELoader() ; |