diff options
| author | angela <angela@lindenlab.com> | 2010-02-11 22:29:43 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-02-11 22:29:43 +0800 |
| commit | 01561ea13ab5741aee70b8873d81078bafb55b86 (patch) | |
| tree | 2c1267e05ccab296525ad1dea469a60560c37a30 /indra/newview/pipeline.cpp | |
| parent | e747e9a3da3166de88dea1af213a36694135b820 (diff) | |
| parent | 69bed1f123f35b6124f4e3255df156b7fe82418b (diff) | |
merge from remote repo
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index bd22fc5f2e..dd9634a234 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1355,6 +1355,7 @@ void LLPipeline::updateMoveNormalAsync(LLDrawable* drawablep) if (!drawablep) { llerrs << "updateMove called with NULL drawablep" << llendl; + return; } if (drawablep->isState(LLDrawable::EARLY_MOVE)) { |