admin/phoenix-firestorm
1
0
Fork 0
mirror of https://github.com/FirestormViewer/phoenix-firestorm.git synced 2026-08-14 08:53:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FIRE-35455] Load script keywords from the sim last so they are most up to date

Browse Source
This commit is contained in:
Hecklezz
2026-04-24 00:07:25 +10:00
parent 98a6437aaa
commit a9bebd2ce9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
indra/newview/llpreviewscript.cpp
+4 -2
View File
@@ -648,7 +648,6 @@ void LLScriptEdCore::processKeywords()
mFunctions->clearRows();
mEditor->clearSegments();
mEditor->initKeywords();
mEditor->loadKeywords();
// <FS:Ansariel> Re-add legacy format support
std::vector<std::string> funcs;
@@ -719,6 +718,8 @@ void LLScriptEdCore::processKeywords()
#endif // OPENSIM
// </FS:Ansariel>
mEditor->loadKeywords();
string_vec_t primary_keywords;
string_vec_t secondary_keywords;
LLKeywordToken *token;
@@ -751,7 +752,6 @@ void LLScriptEdCore::processKeywords()
{
mPostEditor->clearSegments();
mPostEditor->initKeywords();
mPostEditor->loadKeywords();
mPostEditor->loadKeywords(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "scriptlibrary_preproc.xml"), funcs, tooltips, color);
#ifdef OPENSIM
@@ -760,6 +760,8 @@ void LLScriptEdCore::processKeywords()
if (LLGridManager::getInstance()->isInAuroraSim())
mPostEditor->loadKeywords(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "scriptlibrary_aa.xml"), funcs, tooltips, color);
#endif // OPENSIM
mPostEditor->loadKeywords();
}
// NaCl End
}