diff options
| author | Cinder <cinder.roxley@phoenixviewer.com> | 2014-05-07 19:59:41 -0600 |
|---|---|---|
| committer | Cinder <cinder.roxley@phoenixviewer.com> | 2014-05-07 19:59:41 -0600 |
| commit | a354d0efb33ddace2ef97e702b1e4449adcf51ad (patch) | |
| tree | 91c676b8f0503bd58602767044a184c2fc3313d3 /indra/newview/llscripteditor.cpp | |
| parent | 618a409e13f11ce9ded294936e1f7c1d3d1e1efc (diff) | |
| parent | 8501d6494bceeea962d7251d882ddc244a8daa7f (diff) | |
Merge up.
Diffstat (limited to 'indra/newview/llscripteditor.cpp')
| -rw-r--r-- | indra/newview/llscripteditor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llscripteditor.cpp b/indra/newview/llscripteditor.cpp index 12c328e809..31d3c29af4 100644 --- a/indra/newview/llscripteditor.cpp +++ b/indra/newview/llscripteditor.cpp @@ -46,7 +46,7 @@ LLScriptEditor::LLScriptEditor(const Params& p) void LLScriptEditor::initKeywords() { - mKeywords.initialise(LLSyntaxIdLSL::getInstance()->getKeywordsXML()); + mKeywords.initialize(LLSyntaxIdLSL::getInstance()->getKeywordsXML()); } LLTrace::BlockTimerStatHandle FTM_SYNTAX_HIGHLIGHTING("Syntax Highlighting"); |