diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-01 02:25:50 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-01 02:25:50 +0200 |
| commit | 2ab914a9cdd1ad809879aca05dbf4b624949ecea (patch) | |
| tree | c2eb5d49ad6d0db73cf2374704ede44370910d12 /indra/newview/llstartup.cpp | |
| parent | de91391bdd71dd7c9634cf9a736e1032d0fe983e (diff) | |
| parent | 36cb6933e6c1ad92e1887503b74a05c32988b0f1 (diff) | |
Merged in lindenlab/viewer-bear
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 */ } |