diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-02-22 18:33:33 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-02-22 18:33:33 -0600 |
| commit | c690c30ec173faf8d8087ecb38cadbb9dd1adb4e (patch) | |
| tree | 4ba601c39592cf2d36fc568714060280da4dcad3 /indra/newview/llmeshrepository.h | |
| parent | add08538af7bc6c19507835688ac6f970184bb6f (diff) | |
SH-438 Use node name instead of mesh name for object names when importing meshes.
Diffstat (limited to 'indra/newview/llmeshrepository.h')
| -rw-r--r-- | indra/newview/llmeshrepository.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index b642a89192..0fcb2213de 100644 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -108,14 +108,16 @@ class LLModelInstance public: LLPointer<LLModel> mModel; LLPointer<LLModel> mLOD[5]; - + + std::string mLabel; + LLUUID mMeshID; LLMatrix4 mTransform; std::vector<LLImportMaterial> mMaterial; - LLModelInstance(LLModel* model, LLMatrix4& transform, std::vector<LLImportMaterial>& materials) - : mModel(model), mTransform(transform), mMaterial(materials) + LLModelInstance(LLModel* model, const std::string& label, LLMatrix4& transform, std::vector<LLImportMaterial>& materials) + : mModel(model), mLabel(label), mTransform(transform), mMaterial(materials) { } }; |