summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIma Mechanique <ima.mechanique@secondlife.com>2013-11-10 20:24:13 +0000
committerIma Mechanique <ima.mechanique@secondlife.com>2013-11-10 20:24:13 +0000
commit5e27952ee4698006c86ebdca60c4eab305ddebac (patch)
tree23d6511759a06a9c41c3b6d7d10b882d06f9aa7b
parent06ed74f177983e2eb170426712f422253a0b48e7 (diff)
storm-1831 Switch to use the llsyntaxid keywords LLSD directly
-rwxr-xr-xindra/llui/llkeywords.cpp15
-rwxr-xr-xindra/llui/llkeywords.h2
-rwxr-xr-xindra/newview/llpreviewscript.cpp3
3 files changed, 5 insertions, 15 deletions
diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp
index 687c2fb31d..ac95a20588 100755
--- a/indra/llui/llkeywords.cpp
+++ b/indra/llui/llkeywords.cpp
@@ -198,19 +198,10 @@ LLColor4 LLKeywords::getColorGroup(const std::string key_in)
return LLUIColorTable::instance().getColor(ColourGroup);
}
-BOOL LLKeywords::initialise(ELLPath path, const std::string filename)
+bool LLKeywords::initialise(LLSD SyntaxXML)
{
- mReady = false;
- setFilenameSyntax( gDirUtilp->getExpandedFilename(path, filename) );
-
- if (! loadIntoLLSD(mFilenameSyntax, mSyntax) )
- {
- LL_ERRS("") << "Failed to load syntax data from '" << mFilenameSyntax << "', cannot continue!" << LL_ENDL;
- }
- else
- {
- mReady = true;
- }
+ mSyntax = SyntaxXML;
+ mLoaded = mReady = true;
return mReady;
}
diff --git a/indra/llui/llkeywords.h b/indra/llui/llkeywords.h
index 1bd23549d2..24a0450912 100755
--- a/indra/llui/llkeywords.h
+++ b/indra/llui/llkeywords.h
@@ -117,7 +117,7 @@ public:
void setFilenameSyntax(const std::string filename) { mFilenameSyntax = filename; }
void findSegments(std::vector<LLTextSegmentPtr> *seg_list, const LLWString& text, const LLColor4 &defaultColor, class LLTextEditor& editor );
- BOOL initialise(ELLPath path, const std::string filename);
+ bool initialise(LLSD SyntaxXML);
std::string processColors();
std::string processColors(LLSD &data, const std::string strGroup);
void processTokens();
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 5f23249c8d..b464845256 100755
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -409,8 +409,7 @@ BOOL LLScriptEdCore::postBuild()
// Make this work ;-)
mSyntaxIdLSL.initialise();
// ...
- mEditor->mKeywords.initialise(LL_PATH_APP_SETTINGS, "keywords_lsl_default.xml");
-// mEditor->mKeywords.initialise(mSyntaxIdLSL.getFullFileSpec());
+ mEditor->mKeywords.initialise(mSyntaxIdLSL.getKeywordsXML());
// FIX: Refactor LLTextEditor::loadKeywords so these can be removed.
std::vector<std::string> funcs;