summaryrefslogtreecommitdiff
path: root/indra/llrender/llgl.cpp
diff options
context:
space:
mode:
authorBaker Linden <baker@lindenlab.com>2013-01-09 15:25:06 -0800
committerBaker Linden <baker@lindenlab.com>2013-01-09 15:25:06 -0800
commitc4a1bd1c2f2e8da202c59d756e5d49b273e5145c (patch)
tree96f3ccbb2c5d534f021052fafab97bedd6d57e91 /indra/llrender/llgl.cpp
parentb0c449d301299a4ba1b7d83e930f9df6b071b931 (diff)
parentcdd45b9abb35b40f2a31e7433fb99e588df8b40b (diff)
viewer-development merge
Diffstat (limited to 'indra/llrender/llgl.cpp')
-rw-r--r--indra/llrender/llgl.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 0b56b3889c..9e4857b6bc 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -44,7 +44,6 @@
#include "llmath.h"
#include "m4math.h"
#include "llstring.h"
-#include "llmemtype.h"
#include "llstacktrace.h"
#include "llglheaders.h"
@@ -2323,7 +2322,6 @@ void LLGLNamePool::release(GLuint name)
//static
void LLGLNamePool::upkeepPools()
{
- LLMemType mt(LLMemType::MTYPE_UPKEEP_POOLS);
for (tracker_t::instance_iter iter = beginInstances(); iter != endInstances(); ++iter)
{
LLGLNamePool & pool = *iter;