Merge with siana/future

2011-10-13 00:03:56 -05:00
parent 4963a064f1
commit 008bebd817
169 changed files with 15033 additions and 2475 deletions
--- a/indra/llplugin/CMakeLists.txt
+++ b/indra/llplugin/CMakeLists.txt
@@ -65,6 +65,9 @@ endif (NOT WORD_SIZE EQUAL 32)
 list(APPEND llplugin_SOURCE_FILES ${llplugin_HEADER_FILES})

 add_library (llplugin ${llplugin_SOURCE_FILES})
+if(LINUX AND STANDALONE)
+    target_link_libraries (llplugin rt dl)
+endif(LINUX AND STANDALONE)

 add_dependencies(llplugin prepare)