diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-02-22 18:33:57 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-02-22 18:33:57 -0600 |
| commit | e25854fd6acaee8019be5389e0563822f53e45a5 (patch) | |
| tree | ca5b9006f3d96a548cc4cf781240d74f0d26031a /indra/newview/llmeshrepository.h | |
| parent | b53ffe4eae9700ad78f01cfec3458b5611330027 (diff) | |
| parent | c690c30ec173faf8d8087ecb38cadbb9dd1adb4e (diff) | |
merge
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) { } }; |