diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-09-26 16:50:58 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-09-26 16:50:58 -0400 |
| commit | fc8b4ec587d8a05579244940e30b81519a1ebf91 (patch) | |
| tree | d8ab8cd0d3935f43a194946c4a65f2aad7f1b025 | |
| parent | 1e8851c4dfc40fe7dc39b7b3cfae5af97f709290 (diff) | |
DRTVWR-447: Finish pulling in new viewer-release.
| -rw-r--r-- | autobuild.xml | 54 | ||||
| -rw-r--r-- | indra/llcommon/llerror.cpp | 27 |
2 files changed, 73 insertions, 8 deletions
diff --git a/autobuild.xml b/autobuild.xml index 3107d77548..f615a52ba8 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -225,6 +225,60 @@ <key>version</key> <string>1.57</string> </map> + <key>bugsplat</key> + <map> + <key>copyright</key> + <string>Copyright 2003-2017, BugSplat</string> + <key>description</key> + <string>Bugsplat crash reporting package</string> + <key>license</key> + <string>Proprietary</string> + <key>license_file</key> + <string>LICENSES/BUGSPLAT_LICENSE.txt</string> + <key>name</key> + <string>bugsplat</string> + <key>platforms</key> + <map> + <key>darwin64</key> + <map> + <key>archive</key> + <map> + <key>hash</key> + <string>7a7bd828233e8a2b0e9c022f6219e6e7</string> + <key>url</key> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/23730/182106/bugsplat-1.0.6.519145-darwin64-519145.tar.bz2</string> + </map> + <key>name</key> + <string>darwin64</string> + </map> + <key>windows</key> + <map> + <key>archive</key> + <map> + <key>hash</key> + <string>a3938332a11215e6909d67d1b9be5259</string> + <key>url</key> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/23732/182120/bugsplat-3.6.0.4.519145-windows-519145.tar.bz2</string> + </map> + <key>name</key> + <string>windows</string> + </map> + <key>windows64</key> + <map> + <key>archive</key> + <map> + <key>hash</key> + <string>453d624d87a80779f59cfb1880613d90</string> + <key>url</key> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/23731/182115/bugsplat-3.6.0.4.519145-windows64-519145.tar.bz2</string> + </map> + <key>name</key> + <string>windows64</string> + </map> + </map> + <key>version</key> + <string>1.0.6.519145</string> + </map> <key>chardet</key> <map> <key>copyright</key> diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index 06c7aef8ab..6dfb4bf028 100644 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -368,6 +368,7 @@ namespace public: std::ostringstream messageStream; bool messageStreamInUse; + std::string mFatalMessage; void addCallSite(LLError::CallSite&); void invalidateCallSites(); @@ -666,11 +667,16 @@ namespace LLError s->mCrashFunction = f; } - FatalFunction getFatalFunction() - { + FatalFunction getFatalFunction() + { SettingsConfigPtr s = Settings::getInstance()->getSettingsConfig(); - return s->mCrashFunction; - } + return s->mCrashFunction; + } + + std::string getFatalMessage() + { + return Globals::getInstance()->mFatalMessage; + } void setTimeFunction(TimeFunction f) { @@ -1256,12 +1262,17 @@ namespace LLError } addEscapedMessage(message_stream, message); + std::string message_line(message_stream.str()); - writeToRecorders(site, message_stream.str()); - - if (site.mLevel == LEVEL_ERROR && s->mCrashFunction) + writeToRecorders(site, message_line); + + if (site.mLevel == LEVEL_ERROR) { - s->mCrashFunction(message_stream.str()); + g->mFatalMessage = message_line; + if (s->mCrashFunction) + { + s->mCrashFunction(message_line); + } } } } |