diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-12-10 15:02:41 +0000 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-05-18 23:26:01 +0300 |
| commit | 4413f9be879c14328988ce4d285c1dfa263db027 (patch) | |
| tree | 77b56349f1b6ccf53d17f7c267d6871b5e8562c8 /indra | |
| parent | f7edcab9c3187a2dc797db614ba0302ed7eed578 (diff) | |
SL-288, SL-10163 - error reporting for animation upload failures.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewerassetupload.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llviewerassetupload.cpp b/indra/newview/llviewerassetupload.cpp index a320f07a9f..7c6721cad9 100644 --- a/indra/newview/llviewerassetupload.cpp +++ b/indra/newview/llviewerassetupload.cpp @@ -488,6 +488,14 @@ LLSD LLNewFileResourceUploadInfo::exportTempFile() errorLabel = ""; error = false; } + else + { + errorMessage = "Failed saving temporary animation file"; + } + } + else + { + errorMessage = "Failed reading animation file"; } } } @@ -908,6 +916,7 @@ void LLViewerAssetUpload::HandleUploadError(LLCore::HttpStatus status, LLSD &res { args["FILE"] = uploadInfo->getDisplayName(); args["REASON"] = reason; + args["ERROR"] = reason; } LLNotificationsUtil::add(label, args); diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 487730e209..b1f04601fd 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -6145,6 +6145,7 @@ LLJoint *LLVOAvatar::getJoint( const std::string &name ) LLJoint* jointp = NULL; if (iter == mJointMap.end() || iter->second == NULL) + { joint_alias_map_t::const_iterator alias_iter = mJointAliasMap.find(name); std::string canonical_name; if (alias_iter != mJointAliasMap.end()) |