Skip to content
Snippets Groups Projects
Commit f0714a08 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Fix finding message template in linux dev build

parent 05da0078
No related branches found
No related tags found
No related merge requests found
......@@ -528,6 +528,15 @@ bool idle_startup()
message_template_path = gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "app_settings", "message_template.msg");
found_template = LLFile::fopen(message_template_path, "r"); /* Flawfinder: ignore */
}
#elif LL_LINUX
// On the linux dev builds, unpackaged, the message_template.msg
// file will be located in:
// build-linux**/newview/packaged/app_settings
if (!found_template)
{
message_template_path = gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "..", "app_settings", "message_template.msg");
found_template = LLFile::fopen(message_template_path, "r"); /* Flawfinder: ignore */
}
#elif LL_DARWIN
// On Mac dev builds, message_template.msg lives in:
// indra/build-*/newview/<config>/Second Life/Contents/Resources/app_settings
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment