diff options
| author | Michael Pohoreski <ptolemy@lindenlab.com> | 2020-10-16 20:54:13 +0000 |
|---|---|---|
| committer | Michael Pohoreski <ptolemy@lindenlab.com> | 2020-10-16 20:54:13 +0000 |
| commit | 1d25203cbf91bdf390ef9e9ae7c2b5d1b00bb7bb (patch) | |
| tree | 06cdf1844d2b4dc9a98ea3fd7b2622d7573905e4 /indra/newview/llstartup.cpp | |
| parent | 317ff2ce6241b9eaccacbc27117351ebc3d5eea7 (diff) | |
| parent | f22c85cb4164bf7041db137aac86136fb6e5fd83 (diff) | |
Merged in SL-13424_Telemetry_Final (pull request #341)
SL-13424 Add Rad Games Tools local Telemetry profiler support
Approved-by: Dave Houlton
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 3ef2d47d37..8fd9a03a44 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -176,6 +176,7 @@ #include "pipeline.h" #include "llappviewer.h" #include "llfasttimerview.h" +#include "lltelemetry.h" #include "llfloatermap.h" #include "llweb.h" #include "llvoiceclient.h" @@ -527,6 +528,8 @@ bool idle_startup() } #if LL_WINDOWS + LLPROFILE_STARTUP(); + // On the windows dev builds, unpackaged, the message.xml file will // be located in indra/build-vc**/newview/<config>/app_settings. std::string message_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"message.xml"); |