From 5459f2ee987014e88ece017632d73829d844cb6f Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 11 Apr 2012 11:01:00 -0400
Subject: Fix Linux UI issues introduced by moving llinitparam to llcommon. In
 a number of places, the viewer uses a lookup based on std::type_info*. We
 used to use std::map<std::type_info*, whatever>. But on Linux,
 &typeid(SomeType) can produce different pointer values, depending on the
 dynamic load module in which the code is executed. Introduce
 LLTypeInfoLookup<T>, with an API that deliberately mimics
 std::map<std::type_info*, T>. LLTypeInfoLookup::find() first tries an
 efficient search for the specified std::type_info*. But if that fails, it
 scans the underlying container for a match on the std::type_info::name()
 string. If found, it caches the new std::type_info* to optimize subsequent
 lookups with the same pointer. Use LLTypeInfoLookup instead of
 std::map<std::type_info*, ...> in llinitparam.h and llregistry.h. Introduce
 LLSortedVector<KEY, VALUE>, a std::vector<std::pair<KEY, VALUE>> maintained
 in sorted order with binary-search lookup. It presents a subset of the
 std::map<KEY, VALUE> API.

---
 indra/linux_updater/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/linux_updater')

diff --git a/indra/linux_updater/CMakeLists.txt b/indra/linux_updater/CMakeLists.txt
index 00a78b2a8f..4377a6333c 100644
--- a/indra/linux_updater/CMakeLists.txt
+++ b/indra/linux_updater/CMakeLists.txt
@@ -10,14 +10,14 @@ include(UI)
 include(LLCommon)
 include(LLVFS)
 include(LLXML)
-include(LLXUIXML)
+include(LLUI)
 include(Linking)
 
 include_directories(
     ${LLCOMMON_INCLUDE_DIRS}
     ${LLVFS_INCLUDE_DIRS}
     ${LLXML_INCLUDE_DIRS}
-    ${LLXUIXML_INCLUDE_DIRS}
+    ${LLUI_INCLUDE_DIRS}
     ${CURL_INCLUDE_DIRS}
     ${CARES_INCLUDE_DIRS}
     ${OPENSSL_INCLUDE_DIRS}
@@ -42,7 +42,7 @@ target_link_libraries(linux-updater
     ${CRYPTO_LIBRARIES}
     ${UI_LIBRARIES}
     ${LLXML_LIBRARIES}
-    ${LLXUIXML_LIBRARIES}
+    ${LLUI_LIBRARIES}
     ${LLVFS_LIBRARIES}
     ${LLCOMMON_LIBRARIES}
     )
-- 
cgit v1.2.3