diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-02-28 15:44:56 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-02-28 15:44:56 -0800 |
| commit | 52566e4b333a6f91c04034a6bdcb1e9099371d12 (patch) | |
| tree | c5ed54db8fc7400e4acebed1d3f069092123bbd4 /indra/newview/llstartup.cpp | |
| parent | da60cc476a9586449728c5b507a5cc8354cdf611 (diff) | |
| parent | 03db2ddc9c27cf842c6185826617b0da0d2b87f5 (diff) | |
Merge
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 37aaece5d6..243ba00457 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -480,8 +480,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 */ } |