diff options
author | Aura Linden <aura@lindenlab.com> | 2013-07-11 17:49:13 -0700 |
---|---|---|
committer | Aura Linden <aura@lindenlab.com> | 2013-07-11 17:49:13 -0700 |
commit | ce9962b33872db65b70c9b10901ec9062cb59169 (patch) | |
tree | 94be5367128e241ef1c6f802e8551a9b4ed786ff /indra/llxml | |
parent | 8642f57dd95864ec6b002f6519701f30866c6502 (diff) | |
parent | 6060e5e46acbeb20a301070a0fd0efea029d33d0 (diff) |
Merged in viewer-release
Diffstat (limited to 'indra/llxml')
-rwxr-xr-x[-rw-r--r--] | indra/llxml/CMakeLists.txt | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/llxml/llcontrol.cpp | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/llxml/llcontrol.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/llxml/llcontrolgroupreader.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/llxml/llxmlnode.cpp | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/llxml/llxmlnode.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/llxml/llxmlparser.cpp | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/llxml/llxmlparser.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/llxml/llxmltree.cpp | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/llxml/llxmltree.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | indra/llxml/tests/llcontrol_test.cpp | 0 |
11 files changed, 1 insertions, 1 deletions
diff --git a/indra/llxml/CMakeLists.txt b/indra/llxml/CMakeLists.txt index cf96f26a77..17400a203e 100644..100755 --- a/indra/llxml/CMakeLists.txt +++ b/indra/llxml/CMakeLists.txt @@ -42,7 +42,7 @@ list(APPEND llxml_SOURCE_FILES ${llxml_HEADER_FILES}) add_library (llxml ${llxml_SOURCE_FILES}) # Libraries on which this library depends, needed for Linux builds # Sort by high-level to low-level -target_link_libraries(llxml +target_link_libraries( llxml ${LLVFS_LIBRARIES} ${LLMATH_LIBRARIES} ${LLCOMMON_LIBRARIES} diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp index 666c03e9ff..666c03e9ff 100644..100755 --- a/indra/llxml/llcontrol.cpp +++ b/indra/llxml/llcontrol.cpp diff --git a/indra/llxml/llcontrol.h b/indra/llxml/llcontrol.h index ee7d1d50b7..ee7d1d50b7 100644..100755 --- a/indra/llxml/llcontrol.h +++ b/indra/llxml/llcontrol.h diff --git a/indra/llxml/llcontrolgroupreader.h b/indra/llxml/llcontrolgroupreader.h index 6a27a65499..6a27a65499 100644..100755 --- a/indra/llxml/llcontrolgroupreader.h +++ b/indra/llxml/llcontrolgroupreader.h diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp index 7aa2ce9606..7aa2ce9606 100644..100755 --- a/indra/llxml/llxmlnode.cpp +++ b/indra/llxml/llxmlnode.cpp diff --git a/indra/llxml/llxmlnode.h b/indra/llxml/llxmlnode.h index ec486d7957..ec486d7957 100644..100755 --- a/indra/llxml/llxmlnode.h +++ b/indra/llxml/llxmlnode.h diff --git a/indra/llxml/llxmlparser.cpp b/indra/llxml/llxmlparser.cpp index 7db4a90b57..7db4a90b57 100644..100755 --- a/indra/llxml/llxmlparser.cpp +++ b/indra/llxml/llxmlparser.cpp diff --git a/indra/llxml/llxmlparser.h b/indra/llxml/llxmlparser.h index e0f8b69452..e0f8b69452 100644..100755 --- a/indra/llxml/llxmlparser.h +++ b/indra/llxml/llxmlparser.h diff --git a/indra/llxml/llxmltree.cpp b/indra/llxml/llxmltree.cpp index f2386700a1..f2386700a1 100644..100755 --- a/indra/llxml/llxmltree.cpp +++ b/indra/llxml/llxmltree.cpp diff --git a/indra/llxml/llxmltree.h b/indra/llxml/llxmltree.h index bdcb56f1f3..bdcb56f1f3 100644..100755 --- a/indra/llxml/llxmltree.h +++ b/indra/llxml/llxmltree.h diff --git a/indra/llxml/tests/llcontrol_test.cpp b/indra/llxml/tests/llcontrol_test.cpp index ede81956ec..ede81956ec 100644..100755 --- a/indra/llxml/tests/llcontrol_test.cpp +++ b/indra/llxml/tests/llcontrol_test.cpp |