diff options
author | Geenz <geenz@geenzo.com> | 2013-02-15 11:52:18 -0500 |
---|---|---|
committer | Geenz <geenz@geenzo.com> | 2013-02-15 11:52:18 -0500 |
commit | ec3b4e05a43fec4414924eb92a483bc164fb0ec2 (patch) | |
tree | 01c2626f55bef0db287eeca17d00b77e3391cbfb /indra/newview/llpolymesh.cpp | |
parent | c2785a740eb98d28ba705c981f4b6b289501d2e5 (diff) | |
parent | b7cd89da5f74663a9fd547af77afaed06cdb05fd (diff) |
Merge with latest viewer-dev-materials.
Diffstat (limited to 'indra/newview/llpolymesh.cpp')
-rw-r--r-- | indra/newview/llpolymesh.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llpolymesh.cpp b/indra/newview/llpolymesh.cpp index 9902d047e4..5f5258bbce 100644 --- a/indra/newview/llpolymesh.cpp +++ b/indra/newview/llpolymesh.cpp @@ -750,8 +750,6 @@ const LLVector2 &LLPolyMeshSharedData::getUVs(U32 index) //----------------------------------------------------------------------------- LLPolyMesh::LLPolyMesh(LLPolyMeshSharedData *shared_data, LLPolyMesh *reference_mesh) { - LLMemType mt(LLMemType::MTYPE_AVATAR_MESH); - llassert(shared_data); mSharedData = shared_data; |