Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added per skin lsl highlighting and move function color to an actual color

Browse Source
This commit is contained in:
Drake Arconis
2013-03-12 00:46:18 -04:00
parent e93bddcbed
commit aac7fa84c2
4 changed files with 87 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llpreviewscript.cpp
View File

@@ -319,9 +319,15 @@ LLScriptEdCore::LLScriptEdCore(
tooltips.push_back(desc);
}
}
LLColor3 color(0.5f, 0.0f, 0.15f);
mEditor->loadKeywords(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"keywords.ini"), funcs, tooltips, color);
LLColor3 color = vec4to3(gColors.getColor("LSLFunctionColor"));
std::string keywords_ini = gDirUtilp->getExpandedFilename(LL_PATH_TOP_SKIN, "keywords.ini");
if(!LLFile::isfile(keywords_ini))
{
keywords_ini = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "keywords.ini");
}
mEditor->loadKeywords(keywords_ini, funcs, tooltips, color);
std::vector<std::string> primary_keywords;
std::vector<std::string> secondary_keywords;