summaryrefslogtreecommitdiff
path: root/indra/newview/lllocaltextureobject.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/lllocaltextureobject.cpp
parent898e9da1af113704e2e10328dfa5396deb24eb30 (diff)
parent1b8a7fdeaab78216baad1f916e9788c0b90287b3 (diff)
merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/lllocaltextureobject.cpp')
-rw-r--r--indra/newview/lllocaltextureobject.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lllocaltextureobject.cpp b/indra/newview/lllocaltextureobject.cpp
index 69eb5fce2f..116d9bc446 100644
--- a/indra/newview/lllocaltextureobject.cpp
+++ b/indra/newview/lllocaltextureobject.cpp
@@ -70,6 +70,7 @@ LLLocalTextureObject::LLLocalTextureObject(const LLLocalTextureObject& lto) :
if (!original_layer)
{
llerrs << "could not clone Local Texture Object: unable to extract texlayer!" << llendl;
+ continue;
}
LLTexLayer* new_layer = new LLTexLayer(*original_layer);