diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-09-26 16:32:15 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-09-26 16:32:15 -0400 |
| commit | 82bdb300fe66783371c5780c4de499900760e3fb (patch) | |
| tree | 09e4fa6c42fe7a395b5c528768d6171bc20c7461 /indra/newview/llstartup.cpp | |
| parent | 58aef8beaf79dc83546a7b080014ca5030733ac8 (diff) | |
| parent | ceb35372b545cd957f99577ad7076c7f3a65cb97 (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 cc02642203..b44d996558 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 */ } |