diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-05-10 13:57:41 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-05-10 13:57:41 -0600 |
| commit | 2a61d908e790bfd554f3f0968b320a6e2f4d42c4 (patch) | |
| tree | 9e7cd6854a5e6b6c8d6cea31d9d4a8b8f649af7e /indra/newview/pipeline.cpp | |
| parent | e32d1cf7564dd38664781ea7360fa8daa132961c (diff) | |
| parent | b5c834c6fdcee7d7238bebfc561ecee3ecca3589 (diff) | |
Merge
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")) { |