diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-11-14 16:17:36 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-11-14 16:17:36 -0500 |
| commit | f7e99f0db7f9fb52f8001e536f95ec898740631e (patch) | |
| tree | 4f6048435c619a14dd0108bb835068098776874d /indra/newview/llstartup.cpp | |
| parent | 8558ce5c600b810356010ba3cd6d534ef22f4081 (diff) | |
| parent | 4e776c522cb4ba49a5b833d4b9164ab8c48f4b9b (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
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 */ } |