diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-10-06 11:05:33 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-06 11:05:33 -0700 |
| commit | 025b3ff25f6965c31d11237393062afa5d7b7e42 (patch) | |
| tree | e717aac109972fe19f5eb9e9189439125e324b95 | |
| parent | fc489b12c99abab8a61fb3c7546fe802065fe2b0 (diff) | |
| parent | 5d414d6decbf05feae154c992291deab34ed8b92 (diff) | |
Latest from hg.lindenlab.com/sergeylproductengine/viewer-experience-fui including Linux build fix
| -rw-r--r-- | indra/integration_tests/llui_libtest/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llfloaterdestinations.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/integration_tests/llui_libtest/CMakeLists.txt b/indra/integration_tests/llui_libtest/CMakeLists.txt index df47167154..1180460f4b 100644 --- a/indra/integration_tests/llui_libtest/CMakeLists.txt +++ b/indra/integration_tests/llui_libtest/CMakeLists.txt @@ -71,6 +71,7 @@ endif (DARWIN) # Sort by high-level to low-level target_link_libraries(llui_libtest llui + llinventory llmessage ${LLRENDER_LIBRARIES} ${LLIMAGE_LIBRARIES} diff --git a/indra/newview/llfloaterdestinations.cpp b/indra/newview/llfloaterdestinations.cpp index ce36f7759c..52d1f67c36 100644 --- a/indra/newview/llfloaterdestinations.cpp +++ b/indra/newview/llfloaterdestinations.cpp @@ -50,3 +50,4 @@ BOOL LLFloaterDestinations::postBuild() return TRUE; } + |