diff options
| author | callum <none@none> | 2011-05-13 17:09:40 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-05-13 17:09:40 -0700 |
| commit | 889f6cc3b3603bc65ba3cfe19f919e87b3f12366 (patch) | |
| tree | 7cd1dbda844d3a837df476738dabc255c8951a0a /indra/llui/lltransutil.cpp | |
| parent | e4a9704d4157151442accca1116ad70f7f63ae95 (diff) | |
| parent | 1e6d1879a01d57e8949add79fa4f3ef5d11c1c43 (diff) | |
Merge with tip
Diffstat (limited to 'indra/llui/lltransutil.cpp')
| -rw-r--r-- | indra/llui/lltransutil.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/lltransutil.cpp b/indra/llui/lltransutil.cpp index 9d0ff9d5cb..58fa8a0828 100644 --- a/indra/llui/lltransutil.cpp +++ b/indra/llui/lltransutil.cpp @@ -26,10 +26,11 @@ #include "linden_common.h" +#include "lltransutil.h" + #include "lltrans.h" #include "lluictrlfactory.h" - -#include "lltransutil.h" +#include "llxmlnode.h" bool LLTransUtil::parseStrings(const std::string& xml_filename, const std::set<std::string>& default_args) |