diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:40:13 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:40:13 -0400 |
| commit | ee9eef505279bf3983ec5fe4ce64ba3c38f0a76a (patch) | |
| tree | 73ffbc468a65c2d4ed4c0dede4e24ad9e7cd69fd /indra/newview/pipeline.cpp | |
| parent | a248ed2a2ccb89c9716f8657ef3c52269518c909 (diff) | |
| parent | 60bceb759b592348b403689ffa8ed9c768126f8b (diff) | |
merge changes for storm-1057
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")) { |