diff options
| author | Tofu Buzzard <no-email> | 2011-02-22 18:31:56 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-22 18:31:56 -0800 |
| commit | 9c7e38a3d1318f05f43f404e04dbd619a17a3e31 (patch) | |
| tree | 0b48d8e70ca1ce75c71d9a0b29bcb60e015de632 /indra/newview/llmeshrepository.h | |
| parent | 1ff941362fa5617a94fb85839d6540e5abb1b78a (diff) | |
| parent | d46594bf714cd19ebcbf693463c4d39e4c771bb8 (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) { } }; |