diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-10-22 16:22:38 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-10-22 16:22:38 -0400 |
| commit | 91635202563c6578738ea26133e9a26338715edf (patch) | |
| tree | 5fd8ead721df0deb4f421e6740bfff75fd987860 /indra/llprimitive/lldaeloader.cpp | |
| parent | bfe759584f63c0587a2dc6a0086ad9d5b6c63a56 (diff) | |
When adding two enums (!?), coerce to the same enum type.
Diffstat (limited to 'indra/llprimitive/lldaeloader.cpp')
| -rw-r--r-- | indra/llprimitive/lldaeloader.cpp | 4 |
1 files changed, 3 insertions, 1 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 } |