Merge branch 'develop' into maxim/viewer_2245

2 files changed, 4 insertions, 2 deletions

diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index 7fa4230237..b634600de0 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -1073,7 +1073,9 @@ bool LLDAELoader::OpenFile(const std::string& filename)
                 LLModel* mdl = *i;
                 if(mdl->getStatus() != LLModel::NO_ERRORS)
                 {
-                    setLoadState(ERROR_MODEL + mdl->getStatus()) ;
+                    // setLoadState() values >= ERROR_MODEL are reserved to
+                    // report errors with the model itself.
+                    setLoadState(ERROR_MODEL + eLoadState(mdl->getStatus())) ;
                     return false; //abort
                 }
 
diff --git a/indra/llprimitive/llgltfloader.cpp b/indra/llprimitive/llgltfloader.cpp
index 480012699a..48249aa5c4 100644
--- a/indra/llprimitive/llgltfloader.cpp
+++ b/indra/llprimitive/llgltfloader.cpp
@@ -155,7 +155,7 @@ bool LLGLTFLoader::parseMeshes()
         }
         else
         {
-            setLoadState(ERROR_MODEL + pModel->getStatus());
+            setLoadState(ERROR_MODEL + eLoadState(pModel->getStatus()));
             delete(pModel);
             return false;
         }