diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-08 09:24:58 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-08 09:24:58 -0400 |
| commit | ed32a5e2b8e865cfad1d697fd5542b05162c40a9 (patch) | |
| tree | 36616fdac52c4149dd88204054e9cf7e1342ff87 /indra/newview/pipeline.cpp | |
| parent | 9c2f2b884a16d180f83e76d3ed58c949c9692eaf (diff) | |
| parent | 444311d58082ae1277a3628fbe380f7407910f50 (diff) | |
pull tags and late fixes back from viewer-pre-release
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 4 |
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")) { |