summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerparceloverlay.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-11-08 13:05:29 -0600
committerDave Parks <davep@lindenlab.com>2012-11-08 13:05:29 -0600
commitc431ddf629b7f1149c44b2063d216dd34bcd2b12 (patch)
tree7c625873abf2ad80fc25e90e073ff0fcc2e619ab /indra/newview/llviewerparceloverlay.cpp
parentb76b81ff811014012856f58970c1aac093507557 (diff)
parent8c8c2f3b940059f82777c9b0b9f40e4d2f7bc6ab (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llviewerparceloverlay.cpp')
-rw-r--r--indra/newview/llviewerparceloverlay.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewerparceloverlay.cpp b/indra/newview/llviewerparceloverlay.cpp
index a0cf2fc803..a1c12c5cd6 100644
--- a/indra/newview/llviewerparceloverlay.cpp
+++ b/indra/newview/llviewerparceloverlay.cpp
@@ -828,7 +828,6 @@ void LLViewerParcelOverlay::updateGL()
void LLViewerParcelOverlay::idleUpdate(bool force_update)
{
- LLMemType mt_iup(LLMemType::MTYPE_IDLE_UPDATE_PARCEL_OVERLAY);
if (gGLManager.mIsDisabled)
{
return;