diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-13 15:15:15 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-13 15:15:15 -0400 |
| commit | 75722baf295aff7927bff3c70cdf0ec27399cb37 (patch) | |
| tree | a7a3fccc7bfebb4605c561e34ac66ad3c478368e /indra/llprimitive/llprimtexturelist.cpp | |
| parent | 5c68b2456e8603322a1f12694c196246752bab53 (diff) | |
| parent | d348deb7049cbaef7c228000525c7ee5a265464c (diff) | |
merge changes for latest viewer-development
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 36e04df7b7..7ef87ed382 100644 --- a/indra/llprimitive/llprimtexturelist.cpp +++ b/indra/llprimitive/llprimtexturelist.cpp @@ -28,7 +28,6 @@ #include "llprimtexturelist.h" #include "lltextureentry.h" -#include "llmemtype.h" // static //int (TMyClass::*pt2Member)(float, char, char) = NULL; // C++ @@ -367,7 +366,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; |