summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-02-11 14:53:11 +0000
committerAimee Linden <aimee@lindenlab.com>2010-02-11 14:53:11 +0000
commitd7e8a30a5a9bd416254f83e20054c73edf3f890d (patch)
tree43a156ca397913ce7da626ac9c002e1036f2460c /indra/newview/pipeline.cpp
parent898e9da1af113704e2e10328dfa5396deb24eb30 (diff)
parent1b8a7fdeaab78216baad1f916e9788c0b90287b3 (diff)
merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r--indra/newview/pipeline.cpp1
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))
{