diff options
author | Oz Linden <oz@lindenlab.com> | 2013-02-12 13:27:03 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-02-12 13:27:03 -0500 |
commit | 8bb3d0891dfd87b54cd45dfe199c2f1bf21205b3 (patch) | |
tree | 30f038fde12f74908f94be9079cdee759481c5a0 /indra/llprimitive/llprimtexturelist.cpp | |
parent | 66c75202a8a99adeb7de443ce5ebe3d834f91c24 (diff) | |
parent | e87000ba0750e55d9d6b55feccc4124f5d2b4b74 (diff) |
merge up to 3.4.5-release
Diffstat (limited to 'indra/llprimitive/llprimtexturelist.cpp')
-rw-r--r-- | indra/llprimitive/llprimtexturelist.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llprimitive/llprimtexturelist.cpp b/indra/llprimitive/llprimtexturelist.cpp index c0923315cb..537e7a6695 100644 --- a/indra/llprimitive/llprimtexturelist.cpp +++ b/indra/llprimitive/llprimtexturelist.cpp @@ -29,7 +29,6 @@ #include "llprimtexturelist.h" #include "llmaterialid.h" #include "lltextureentry.h" -#include "llmemtype.h" // static //int (TMyClass::*pt2Member)(float, char, char) = NULL; // C++ @@ -386,7 +385,6 @@ S32 LLPrimTextureList::size() const // sets the size of the mEntryList container void LLPrimTextureList::setSize(S32 new_size) { - LLMemType m1(LLMemType::MTYPE_PRIMITIVE); if (new_size < 0) { new_size = 0; |