diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-03-22 20:40:45 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-03-22 20:40:45 -0400 |
| commit | d7eb9b36fe7c801d9bbb554ef40c3d8d712f5bfb (patch) | |
| tree | 6ecfd42c64c4ca452a7f32f74a72775536afb88a /indra/newview/llmeshrepository.h | |
| parent | 29dc641fbe7ab77f77fe19e2e7976980f0649b5b (diff) | |
| parent | 89e09646824122e20194400e93bcdb0b212f96fe (diff) | |
pulling from mesh development. merge.
Diffstat (limited to 'indra/newview/llmeshrepository.h')
| -rw-r--r-- | indra/newview/llmeshrepository.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h index ccdcc03310..f0c0f308d5 100644 --- a/indra/newview/llmeshrepository.h +++ b/indra/newview/llmeshrepository.h @@ -101,6 +101,10 @@ public: { mDiffuseColor.set(1,1,1,1); } + + LLImportMaterial(LLSD& data); + + LLSD asLLSD(); }; class LLModelInstance @@ -112,6 +116,7 @@ public: std::string mLabel; LLUUID mMeshID; + S32 mLocalMeshID; LLMatrix4 mTransform; std::vector<LLImportMaterial> mMaterial; @@ -119,7 +124,12 @@ public: LLModelInstance(LLModel* model, const std::string& label, LLMatrix4& transform, std::vector<LLImportMaterial>& materials) : mModel(model), mLabel(label), mTransform(transform), mMaterial(materials) { + mLocalMeshID = -1; } + + LLModelInstance(LLSD& data); + + LLSD asLLSD(); }; class LLMeshSkinInfo |