diff options
Diffstat (limited to 'indra/integration_tests')
| -rw-r--r-- | indra/integration_tests/llui_libtest/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/integration_tests/llui_libtest/llui_libtest.cpp | 6 | 
2 files changed, 5 insertions, 3 deletions
| diff --git a/indra/integration_tests/llui_libtest/CMakeLists.txt b/indra/integration_tests/llui_libtest/CMakeLists.txt index 88564c6085..1ccdb0f20b 100644 --- a/indra/integration_tests/llui_libtest/CMakeLists.txt +++ b/indra/integration_tests/llui_libtest/CMakeLists.txt @@ -16,6 +16,7 @@ include(LLWindow)  include(LLUI)  include(LLVFS)        # ugh, needed for LLDir  include(LLXML) +include(LLXUIXML)  include(Linking)  # include(Tut) @@ -29,6 +30,7 @@ include_directories(      ${LLVFS_INCLUDE_DIRS}      ${LLWINDOW_INCLUDE_DIRS}      ${LLXML_INCLUDE_DIRS} +    ${LLXUIXML_INCLUDE_DIRS}      )  set(llui_libtest_SOURCE_FILES diff --git a/indra/integration_tests/llui_libtest/llui_libtest.cpp b/indra/integration_tests/llui_libtest/llui_libtest.cpp index 3d433fdfdc..3631761c93 100644 --- a/indra/integration_tests/llui_libtest/llui_libtest.cpp +++ b/indra/integration_tests/llui_libtest/llui_libtest.cpp @@ -43,7 +43,7 @@  #include "llfloater.h"  #include "llfontfreetype.h"  #include "llfontgl.h" -#include "lltrans.h" +#include "lltransutil.h"  #include "llui.h"  #include "lluictrlfactory.h" @@ -154,8 +154,8 @@ void init_llui()  	// Otherwise we get translation warnings when setting up floaters  	// (tooltips for buttons)  	std::set<std::string> default_args; -	LLTrans::parseStrings("strings.xml", default_args); -    LLTrans::parseLanguageStrings("language_settings.xml"); +	LLTransUtil::parseStrings("strings.xml", default_args); +	LLTransUtil::parseLanguageStrings("language_settings.xml");  	LLFontManager::initClass();  	// Creating widgets apparently requires fonts to be initialized, | 
