summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-17 14:56:01 -0400
committerOz Linden <oz@lindenlab.com>2011-03-17 14:56:01 -0400
commitf64a20ddcff91677b02b7688e08819cffb0989c9 (patch)
tree707b1430e5b7ef2e27f4f34c66822e92dfffd294 /indra/newview/pipeline.cpp
parentc077250ff16aeaf0ec4c036154a427c677e85eb3 (diff)
parent17d87b0fa5bdd8d15dbcd98e65c30ebf4e5b94ec (diff)
merge changes for storm-1016
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r--indra/newview/pipeline.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 13e537fae5..65fdc12f0a 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -6851,7 +6851,6 @@ void LLPipeline::renderDeferredLighting()
{
// Render debugging beacons.
gObjectList.renderObjectBeacons();
- LLHUDObject::renderAll();
gObjectList.resetObjectBeacons();
}
}