diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-09-25 13:35:45 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-09-25 13:35:45 -0400 |
| commit | ceb35372b545cd957f99577ad7076c7f3a65cb97 (patch) | |
| tree | 4dfb08a586042d7d98eee4072ac70a1ede5760e2 /indra/newview/llstartup.cpp | |
| parent | b51972bac7f0b11955474baebebd3f1d7c9e60e3 (diff) | |
| parent | cc376f86e8496e9e924fd596064c13ee6aa0133e (diff) | |
Automated merge with https://bitbucket.org/oz_linden/viewer-release-cmake3.12
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 7a4c41779a..4c51873715 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -479,8 +479,7 @@ bool idle_startup() if (!found_template) { message_template_path = - gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, - "../Resources/app_settings", + gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "message_template.msg"); found_template = LLFile::fopen(message_template_path.c_str(), "r"); /* Flawfinder: ignore */ } |