diff options
| author | Cinder <cinder.roxley@phoenixviewer.com> | 2014-05-07 19:58:56 -0600 |
|---|---|---|
| committer | Cinder <cinder.roxley@phoenixviewer.com> | 2014-05-07 19:58:56 -0600 |
| commit | 8501d6494bceeea962d7251d882ddc244a8daa7f (patch) | |
| tree | 31a739f8cbf705ec4941c295a298fd7aa8703a03 /indra/llui | |
| parent | e8422e5bed6c593c8a26b533f33103911a1d3da6 (diff) | |
Code policy
Diffstat (limited to 'indra/llui')
| -rwxr-xr-x | indra/llui/llkeywords.cpp | 2 | ||||
| -rwxr-xr-x | indra/llui/llkeywords.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp index bae604e270..346b9a83bd 100755 --- a/indra/llui/llkeywords.cpp +++ b/indra/llui/llkeywords.cpp @@ -251,7 +251,7 @@ LLColor4 LLKeywords::getColorGroup(const std::string& key_in) return LLUIColorTable::instance().getColor(color_group); } -void LLKeywords::initialise(LLSD SyntaxXML) +void LLKeywords::initialize(LLSD SyntaxXML) { mSyntax = SyntaxXML; mLoaded = true; diff --git a/indra/llui/llkeywords.h b/indra/llui/llkeywords.h index b17e9dd942..eecb327fee 100755 --- a/indra/llui/llkeywords.h +++ b/indra/llui/llkeywords.h @@ -115,7 +115,7 @@ public: bool isLoaded() const { return mLoaded; } void findSegments(std::vector<LLTextSegmentPtr> *seg_list, const LLWString& text, const LLColor4 &defaultColor, class LLTextEditor& editor ); - void initialise(LLSD SyntaxXML); + void initialize(LLSD SyntaxXML); void processTokens(); // Add the token as described |