diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-01-09 16:39:30 -0500 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-01-09 16:39:30 -0500 |
| commit | cc0a4bf6acafe759baaccea65022c963373ea012 (patch) | |
| tree | d4fe1f1e34b1ab0d140a37c1f80d09034824d3e8 /indra/llrender/llgl.cpp | |
| parent | 11e506f2eb979a5ddfc3ca6f9c626771ab012a78 (diff) | |
| parent | cdd45b9abb35b40f2a31e7433fb99e588df8b40b (diff) | |
Merge. Pull viewer-development in prior to filing DRTVWR merge request.
Diffstat (limited to 'indra/llrender/llgl.cpp')
| -rw-r--r-- | indra/llrender/llgl.cpp | 2 |
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; |