Skip to content

Commit 472ea3b

Browse files
committed
#4393 Handle unknown exceptions in uploader better
Output is highly technical, but better than nothing
1 parent d848979 commit 472ea3b

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

indra/llprimitive/llmodelloader.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
#include "llmatrix4a.h"
3535
#include <boost/bind.hpp>
36+
#include <boost/exception/diagnostic_information.hpp>
3637

3738
std::list<LLModelLoader*> LLModelLoader::sActiveLoaderList;
3839

@@ -184,7 +185,7 @@ void LLModelLoader::run()
184185
LLSD args;
185186
args["Message"] = "UnknownException";
186187
args["FILENAME"] = mFilename;
187-
args["EXCEPTION"] = "Unknown exception";
188+
args["EXCEPTION"] = boost::current_exception_diagnostic_information();
188189
mWarningsArray.append(args);
189190
setLoadState(ERROR_PARSING);
190191
}

indra/newview/gltf/llgltfloader.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959

6060
#include <boost/regex.hpp>
6161
#include <boost/algorithm/string/replace.hpp>
62+
#include <boost/exception/diagnostic_information.hpp>
6263
#include <fstream>
6364

6465
static const std::string lod_suffix[LLModel::NUM_LODS] =
@@ -154,7 +155,7 @@ bool LLGLTFLoader::OpenFile(const std::string &filename)
154155
LLSD args;
155156
args["Message"] = "ParsingErrorException";
156157
args["FILENAME"] = filename;
157-
args["EXCEPTION"] = "Unknown exception";
158+
args["EXCEPTION"] = boost::current_exception_diagnostic_information();
158159
mWarningsArray.append(args);
159160
setLoadState(ERROR_PARSING);
160161
return false;

0 commit comments

Comments
 (0)