From a89f3f29a0af37c7f3e78e38acb78f78e99dae78 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Fri, 24 Apr 2015 20:30:26 +0300
Subject: [PATCH] MAINT-4796 FIXED Crash in LLModelLoader::loadFromSLM
---
indra/newview/llfloatermodelpreview.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 3f62d94dae9..005c6999c3d 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -2232,10 +2232,15 @@ bool LLModelLoader::loadFromSLM(const std::string& filename)
for (U32 lod = 0; lod < LLModel::NUM_LODS; ++lod)
{
- if (!model[lod].empty())
+ if (model[lod].size() > idx)
{
instance_list[i].mLOD[lod] = model[lod][idx];
}
+ else if (!model[lod].empty())
+ {
+ // slm load failed - indexes are corrupted
+ return false;
+ }
}
instance_list[i].mModel = model[LLModel::LOD_HIGH][idx];
--
GitLab