diff options
| author | Tofu Buzzard <no-email> | 2011-02-22 18:32:25 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-22 18:32:25 -0800 |
| commit | df42eceb91e796c876639aa4a711b9baaf438914 (patch) | |
| tree | 520e3291611c40bed28a0c8d73b55fa102602a64 /indra/newview/llmeshrepository.h | |
| parent | b660dcfce4bafd0320be97e25c38ff09ceac336d (diff) | |
| parent | 9c7e38a3d1318f05f43f404e04dbd619a17a3e31 (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) { } }; |