diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-13 13:28:51 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-13 13:28:51 -0400 |
| commit | 66c078de5e5a6b685d435f7b1a462d64ca80f35e (patch) | |
| tree | a1fe4ac67d499a565ea98b390dedbeef0a62acc2 /indra/llui/lltransutil.cpp | |
| parent | 27fd0d1a93da8a2ad1aa445e8d8258f9e910ae8c (diff) | |
| parent | e8ede07451c65aea898bc3f58a980b6b0d9af302 (diff) | |
merge up to latest viewer-development
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) |