livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Surprise! Viewer wasn't using downloaded OpenSim script library files...

meow-7.2.2
Ansariel 2017-10-18 14:36:40 +02:00
parent 5882e388d3
commit 9971c42963
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
indra/newview/llpreviewscript.cpp
View File

@ -631,12 +631,36 @@ void LLScriptEdCore::processKeywords()
LLColor3 color(LLUIColorTable::instance().getColor("SyntaxLslFunction"));
if (gSavedSettings.getBOOL("_NACL_LSLPreprocessor"))
{
mEditor->loadKeywords(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "scriptlibrary_preproc.xml"), funcs, tooltips, color);
}
#ifdef OPENSIM
if (LLGridManager::getInstance()->isInOpenSim())
mEditor->loadKeywords(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "scriptlibrary_ossl.xml"), funcs, tooltips, color);
{
std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "scriptlibrary_ossl.xml");
if (LLFile::isfile(filename))
{
mEditor->loadKeywords(filename, funcs, tooltips, color);
}
else
{
mEditor->loadKeywords(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "scriptlibrary_ossl.xml"), funcs, tooltips, color);
}
}
if (LLGridManager::getInstance()->isInAuroraSim())
mEditor->loadKeywords(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "scriptlibrary_aa.xml"), funcs, tooltips, color);
{
std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "scriptlibrary_aa.xml");
if (LLFile::isfile(filename))
{
mEditor->loadKeywords(filename, funcs, tooltips, color);
}
else
{
mEditor->loadKeywords(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "scriptlibrary_aa.xml"), funcs, tooltips, color);
}
}
#endif // OPENSIM
// </FS:Ansariel>