diff options
author | Don Kjer <don@lindenlab.com> | 2011-05-17 19:21:55 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-05-17 19:21:55 +0000 |
commit | ae8ed3fc2d4a7dda92ad8fdb34bc559478eb9177 (patch) | |
tree | 64cd5d3328dbb56b03a03cf873a613005d0394dc /indra/llxuixml/lltrans.h | |
parent | c62ef53863bd01cb96de55e0250c8a8193b6c72b (diff) | |
parent | 113f532ee57eeeca4dc7eb6ca05f923f1f3543d3 (diff) |
Merge with viewer-development
Diffstat (limited to 'indra/llxuixml/lltrans.h')
-rw-r--r-- | indra/llxuixml/lltrans.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/llxuixml/lltrans.h b/indra/llxuixml/lltrans.h index 5b127b53cf..b7091f77e8 100644 --- a/indra/llxuixml/lltrans.h +++ b/indra/llxuixml/lltrans.h @@ -29,8 +29,10 @@ #include <map> +#include "llpointer.h" #include "llstring.h" -#include "llxmlnode.h" + +class LLXMLNode; /** * @brief String template loaded from strings.xml @@ -61,9 +63,9 @@ public: * @param default_args Set of strings (expected to be in the file) to use as default replacement args, e.g. "SECOND_LIFE" * @returns true if the file was parsed successfully, true if something went wrong */ - static bool parseStrings(LLXMLNodePtr& root, const std::set<std::string>& default_args); + static bool parseStrings(LLPointer<LLXMLNode> & root, const std::set<std::string>& default_args); - static bool parseLanguageStrings(LLXMLNodePtr &root); + static bool parseLanguageStrings(LLPointer<LLXMLNode> & root); /** * @brief Returns a translated string |