merge

1 files changed, 6 insertions, 0 deletions

diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h
index 4d727bf1f2..f0c0f308d5 100644
--- a/indra/newview/llmeshrepository.h
+++ b/indra/newview/llmeshrepository.h
@@ -102,6 +102,8 @@ public:
 		mDiffuseColor.set(1,1,1,1);
 	}
 
+	LLImportMaterial(LLSD& data);
+
 	LLSD asLLSD();
 };
 
@@ -114,6 +116,7 @@ public:
 	std::string mLabel;
 
 	LLUUID mMeshID;
+	S32 mLocalMeshID;
 
 	LLMatrix4 mTransform;
 	std::vector<LLImportMaterial> mMaterial;
@@ -121,8 +124,11 @@ 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();
 };