diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-22 18:51:29 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-22 18:51:29 +0200 |
| commit | 75bd1bcd1217493d3de908a5b609186cfbd4d7ce (patch) | |
| tree | fc6ecb7089859738f723e39983b4eaeee07fbaa4 /indra/newview/llmeshrepository.cpp | |
| parent | 6a3cb73009bccdef6ae1fbb5d8b632f90343ad91 (diff) | |
| parent | 2c4133c8db131b08d40fc91e2881b873ea1a984d (diff) | |
Merge branch 'master' into DRTVWR-482
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
| -rw-r--r-- | indra/newview/llmeshrepository.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 31e3d408d7..95322cce6d 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -2772,7 +2772,7 @@ void LLMeshUploadThread::onCompleted(LLCore::HttpHandle handle, LLCore::HttpResp if (observer) { - observer->setModelPhysicsFeeErrorStatus(status.toULong(), reason); + observer->setModelPhysicsFeeErrorStatus(status.toULong(), reason, body["error"]); } } else @@ -2805,7 +2805,7 @@ void LLMeshUploadThread::onCompleted(LLCore::HttpHandle handle, LLCore::HttpResp if (observer) { - observer->setModelPhysicsFeeErrorStatus(status.toULong(), reason); + observer->setModelPhysicsFeeErrorStatus(status.toULong(), reason, body["error"]); } } } |