summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-06 19:20:03 -0400
committerOz Linden <oz@lindenlab.com>2011-04-06 19:20:03 -0400
commit52615d251bc9261fe5765feefbcd31021bd75934 (patch)
tree2e259b393c6d2405d4a5e30ae9dd25e282c78a4d /indra/newview/pipeline.cpp
parent0a802ae351153008b40d42106c866836d0ee4954 (diff)
parenta1a5a793a70f62c977e97b7433840fcb70f47c03 (diff)
pull pack late beta fixes from 2.6.3
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r--indra/newview/pipeline.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 58dc90ccd9..6dc8f28265 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -1228,10 +1228,6 @@ void LLPipeline::unlinkDrawable(LLDrawable *drawable)
U32 LLPipeline::addObject(LLViewerObject *vobj)
{
LLMemType mt_ao(LLMemType::MTYPE_PIPELINE_ADD_OBJECT);
- if (gNoRender)
- {
- return 0;
- }
if (gSavedSettings.getBOOL("RenderDelayCreation"))
{