diff options
| author | leyla_linden <none@none> | 2011-02-23 16:38:45 -0800 |
|---|---|---|
| committer | leyla_linden <none@none> | 2011-02-23 16:38:45 -0800 |
| commit | b0e64098ba7dabec0b14d0129efa87b5e5a29df2 (patch) | |
| tree | 1efebf171b17a4eb5a47cfba224a268dfe54e337 /indra/newview/llmeshrepository.h | |
| parent | 9f537ad93fe7992bb6d652473a4ac3680320cab5 (diff) | |
| parent | 34428b305a437256f5db170db91506e2d94440e9 (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) { } }; |