summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Lihatskiy <andreylproductengine@lindenlab.com>2019-09-11 16:21:23 +0000
committerAndrey Lihatskiy <andreylproductengine@lindenlab.com>2019-09-11 16:21:23 +0000
commit968b64471a5b48a2930917cee591a58879c20fc9 (patch)
tree0ac75966f25686dddb61a5e1d61b4ae630efe333
parent153c2b2446cee584cec034405921bdd9bfdc7c70 (diff)
parent8a9a9295999a67e97b16c3e0ff4b9fdfd8298904 (diff)
Merged in default (pull request #948)
SL-11848 Fixed login crash (Face with no texture index references indexed texture draw info) Approved-by: Graham Madarasz
-rw-r--r--indra/newview/llface.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 912bde9986..1d782cdabe 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -462,7 +462,7 @@ void LLFace::setTextureIndex(U8 index)
}
else
{
- if (mDrawInfo && !mDrawInfo->mTextureList.empty())
+ if (mDrawInfo && mDrawInfo->mTextureList.size() <= 1)
{
LL_ERRS() << "Face with no texture index references indexed texture draw info." << LL_ENDL;
}