diff options
author | Glenn Glazer <coyot@lindenlab.com> | 2015-09-16 14:21:03 -0700 |
---|---|---|
committer | Glenn Glazer <coyot@lindenlab.com> | 2015-09-16 14:21:03 -0700 |
commit | b09f0a120e53c8b27d196df6a33a42c9ac0e146c (patch) | |
tree | ec0eb9ec35ed7a5fe62a98e1c12f272363467879 /indra/llcrashlogger/llcrashlogger.h | |
parent | 1be63209331d509396bd7ee79302d511fe83d72e (diff) |
maint-5422 changes and merge from release
Diffstat (limited to 'indra/llcrashlogger/llcrashlogger.h')
-rwxr-xr-x | indra/llcrashlogger/llcrashlogger.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcrashlogger/llcrashlogger.h b/indra/llcrashlogger/llcrashlogger.h index a06bf1d6ac..b8a007f2be 100755 --- a/indra/llcrashlogger/llcrashlogger.h +++ b/indra/llcrashlogger/llcrashlogger.h @@ -46,7 +46,7 @@ public: LLCrashLogger(); virtual ~LLCrashLogger(); S32 loadCrashBehaviorSetting(); - bool readDebugFromXML(LLSD& dest, const std::string& filename ); + bool readFromXML(LLSD& dest, const std::string& filename ); void gatherFiles(); void mergeLogs( LLSD src_sd ); |