#4393 Handle unknown exceptions in uploader better

Output is highly technical, but better than nothing

2 files changed, 4 insertions, 2 deletions

diff --git a/indra/llprimitive/llmodelloader.cpp b/indra/llprimitive/llmodelloader.cpp
index 630c109d8f..0383659f62 100644
--- a/indra/llprimitive/llmodelloader.cpp
+++ b/indra/llprimitive/llmodelloader.cpp
@@ -33,6 +33,7 @@
 
 #include "llmatrix4a.h"
 #include <boost/bind.hpp>
+#include <boost/exception/diagnostic_information.hpp>
 
 std::list<LLModelLoader*> LLModelLoader::sActiveLoaderList;
 
@@ -184,7 +185,7 @@ void LLModelLoader::run()
         LLSD args;
         args["Message"] = "UnknownException";
         args["FILENAME"] = mFilename;
-        args["EXCEPTION"] = "Unknown exception";
+        args["EXCEPTION"] = boost::current_exception_diagnostic_information();
         mWarningsArray.append(args);
         setLoadState(ERROR_PARSING);
     }
diff --git a/indra/newview/gltf/llgltfloader.cpp b/indra/newview/gltf/llgltfloader.cpp
index 9f6caf4198..950e98c96d 100644
--- a/indra/newview/gltf/llgltfloader.cpp
+++ b/indra/newview/gltf/llgltfloader.cpp
@@ -59,6 +59,7 @@
 
 #include <boost/regex.hpp>
 #include <boost/algorithm/string/replace.hpp>
+#include <boost/exception/diagnostic_information.hpp>
 #include <fstream>
 
 static const std::string lod_suffix[LLModel::NUM_LODS] =
@@ -154,7 +155,7 @@ bool LLGLTFLoader::OpenFile(const std::string &filename)
         LLSD args;
         args["Message"] = "ParsingErrorException";
         args["FILENAME"] = filename;
-        args["EXCEPTION"] = "Unknown exception";
+        args["EXCEPTION"] = boost::current_exception_diagnostic_information();
         mWarningsArray.append(args);
         setLoadState(ERROR_PARSING);
         return false;