diff options
| author | Richard Linden <none@none> | 2010-08-25 16:47:07 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-08-25 16:47:07 -0700 |
| commit | 3604f7fe4b35758db3a730e5efa4a06b2326bdfb (patch) | |
| tree | ee8d4d7078c33eb20a773686a1c367e5a2e00cdb /indra/llui/lluicolortable.cpp | |
| parent | c1405887c982f5a7396892017e4ea426ede9af23 (diff) | |
| parent | a0b15c827ee7704c1557c9c882ec236d5d67f948 (diff) | |
merge
Diffstat (limited to 'indra/llui/lluicolortable.cpp')
| -rw-r--r-- | indra/llui/lluicolortable.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/lluicolortable.cpp b/indra/llui/lluicolortable.cpp index 1b64ef3abe..88140f1a49 100644 --- a/indra/llui/lluicolortable.cpp +++ b/indra/llui/lluicolortable.cpp @@ -243,7 +243,8 @@ void LLUIColorTable::saveUserSettings() const } LLXMLNodePtr output_node = new LLXMLNode("colors", false); - LLXUIParser::instance().writeXUI(output_node, params); + LLXUIParser parser; + parser.writeXUI(output_node, params); if(!output_node->isNull()) { @@ -309,7 +310,8 @@ bool LLUIColorTable::loadFromFilename(const std::string& filename, string_color_ } Params params; - LLXUIParser::instance().readXUI(root, params, filename); + LLXUIParser parser; + parser.readXUI(root, params, filename); if(params.validateBlock()) { |