diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2011-05-12 17:08:20 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2011-05-12 17:08:20 -0700 |
| commit | f7a01d7b338bcd9c7ee09022a6179b3c6710237d (patch) | |
| tree | ff8b8f6b741d3b016570ef3f5809ae45ca270493 /indra/llui/lltransutil.cpp | |
| parent | 6fcf9e4817a5c245f7779dd030b0ba75dab10e5e (diff) | |
| parent | 2661a4c2c9359f2c2cabce6f48704dc8fb481994 (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) |