diff options
| author | Joshua Bell <josh@lindenlab.com> | 2011-05-16 10:09:53 -0700 |
|---|---|---|
| committer | Joshua Bell <josh@lindenlab.com> | 2011-05-16 10:09:53 -0700 |
| commit | cfad224f1c56556e58cfe7f3fe0606b4ab164ef8 (patch) | |
| tree | 1000311071eb6b9d8a1132f860ffd980bb5f5c5b /indra/llui/lltransutil.cpp | |
| parent | f440cd4af6cb7cd791e5f0eddb8dc9b99a37e0b0 (diff) | |
| parent | 0b5f662c3bf1655b95dbb92ad3f16bae37ee04f4 (diff) | |
Merge
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) |