diff options
author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2013-01-30 15:25:09 -0800 |
---|---|---|
committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2013-01-30 15:25:09 -0800 |
commit | ee87ef23037f5e2904dfea3da061a9548cc113f5 (patch) | |
tree | d3aaa5405c97866529e2029572d81ebbd90b8d4a /indra/newview/llpolymesh.cpp | |
parent | 07b557cef909d74cd514b2d7e6b666edbfae3ef2 (diff) | |
parent | 60d1404b212824939b8bcd17fd2cc1e46e9bac55 (diff) |
merge downstream code from viewer-lion
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; |