diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-05-17 21:53:10 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-05-17 21:53:10 +0300 |
| commit | 001b9e5ae3ec016d86bb1f58cbff0ebc5d073af0 (patch) | |
| tree | c6eff7167bcbabec5b3104108115ae3f07652779 /indra/llui/lltransutil.cpp | |
| parent | 4a882c82dcc236b9154087cdd886d3dd076099c9 (diff) | |
| parent | 113f532ee57eeeca4dc7eb6ca05f923f1f3543d3 (diff) | |
Merge from 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) |