diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-06-14 12:16:12 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-06-14 12:16:12 -0400 |
| commit | f7137765438f149cbae6f3b18da45dce75a25336 (patch) | |
| tree | a93605eb2f22f97477ee418a1de04d9821713f07 /indra/newview/llluamanager.cpp | |
| parent | dc91db0b85c5db1c20dccebd64c98419e371a29f (diff) | |
Move Lua modules for 'require' to indra/newview/scripts/lua/require.
Make viewer_manifest.py copy them into the viewer install image.
Make the require() function look for them there.
Diffstat (limited to 'indra/newview/llluamanager.cpp')
| -rw-r--r-- | indra/newview/llluamanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llluamanager.cpp b/indra/newview/llluamanager.cpp index 6f72eb4142..5aa47d7566 100644 --- a/indra/newview/llluamanager.cpp +++ b/indra/newview/llluamanager.cpp @@ -386,10 +386,10 @@ void LLRequireResolver::findModule() std::vector<fsyspath> lib_paths { - gDirUtilp->getExpandedFilename(LL_PATH_SCRIPTS, "lua"), + gDirUtilp->getExpandedFilename(LL_PATH_SCRIPTS, "lua", "require"), #ifdef LL_TEST // Build-time tests don't have the app bundle - use source tree. - fsyspath(__FILE__).parent_path() / "scripts" / "lua", + fsyspath(__FILE__).parent_path() / "scripts" / "lua" / "require", #endif }; |