summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerparceloverlay.cpp
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2013-02-15 11:52:18 -0500
committerGeenz <geenz@geenzo.com>2013-02-15 11:52:18 -0500
commitec3b4e05a43fec4414924eb92a483bc164fb0ec2 (patch)
tree01c2626f55bef0db287eeca17d00b77e3391cbfb /indra/newview/llviewerparceloverlay.cpp
parentc2785a740eb98d28ba705c981f4b6b289501d2e5 (diff)
parentb7cd89da5f74663a9fd547af77afaed06cdb05fd (diff)
Merge with latest viewer-dev-materials.
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;