summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2018-05-25 21:11:54 +0000
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2018-05-25 21:11:54 +0000
commit9e58cb266c1084e21c3d945f9d9fe23bf46bd01e (patch)
treef3c52f63655fe5b33d1794f44f52151e41176b5c /indra
parentfadb6c7c65f4d531f513d5d896ca25b9bb22b48f (diff)
MAINT-8693 Fixed crashes during login if you wear a BOM tattoo layer
Diffstat (limited to 'indra')
-rw-r--r--indra/llappearance/llwearable.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llappearance/llwearable.cpp b/indra/llappearance/llwearable.cpp
index 63069adcc8..edcfd49bb4 100644
--- a/indra/llappearance/llwearable.cpp
+++ b/indra/llappearance/llwearable.cpp
@@ -437,7 +437,13 @@ LLWearable::EImportResult LLWearable::importStream( std::istream& input_stream,
LL_WARNS() << "Bad Wearable asset: bad texture, #" << i << LL_ENDL;
return LLWearable::FAILURE;
}
-
+
+ if (te >= ETextureIndex::TEX_NUM_INDICES) //createLayers() converts to ETextureIndex
+ {
+ LL_WARNS() << "Bad Wearable asset: bad texture index: " << te << LL_ENDL;
+ return LLWearable::FAILURE;
+ }
+
if( !LLUUID::validate( uuid_buffer ) )
{
LL_WARNS() << "Bad Wearable asset: bad texture uuid: "