summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
diff options
context:
space:
mode:
authorAnchor Linden <anchor@lindenlab.com>2018-07-15 21:33:02 +0530
committerAnchor Linden <anchor@lindenlab.com>2018-07-15 21:33:02 +0530
commitdcbf57ab2d3ec86d9e2b3ec7d3c627f37fe24392 (patch)
tree7a11fbd223be465e5600693ad35003d7509eb0d8 /indra/newview/llviewerobject.cpp
parent917ab7be9e1eefec23d67a5ee5c8cb8c1955c2d4 (diff)
[MAINT-8846] - fixing duplicate id in avatar_lad.xml fixrs character test female crash. code cleanup.
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rw-r--r--indra/newview/llviewerobject.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 4f64ee94c1..ace2504fbd 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -4408,7 +4408,6 @@ LLViewerTexture* LLViewerObject::getBakedTextureForMagicId(const LLUUID& id)
return LLViewerTextureManager::getFetchedTexture(id, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
}
- return NULL;
}
void LLViewerObject::updateAvatarMeshVisibility(const LLUUID& id, const LLUUID& old_id)