diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-29 06:23:41 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-29 06:23:41 +0000 |
| commit | a1ed9ccf7330354d5df5083b44643f2a7e56b748 (patch) | |
| tree | 75caa29925495a74548111da1800d67126343d13 /indra/llcommon/CMakeLists.txt | |
| parent | c4384d64a11fe96764f240a9e220989ad5546f16 (diff) | |
Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> viewer-2.0.0-3
Includes:
* DEV-31909 VWR-13251: Revise lscript_library.cpp to allow localization of LSL editor hovertips
* DEV-21938 llSHA1String does not appear where expected in the dropdown "Insert" menu in the LSL editor
* Some cleanup to llerror so that it doesn't depend on llfixedbuffer
* A few misc. server specific changes not related to the texture-pipeline changes (llapp, lloptioninterface)
Diffstat (limited to 'indra/llcommon/CMakeLists.txt')
| -rw-r--r-- | indra/llcommon/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 9f1b0b48d8..a93623d24e 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -52,6 +52,7 @@ set(llcommon_SOURCE_FILES llmemtype.cpp llmetrics.cpp llmortician.cpp + lloptioninterface.cpp llptrto.cpp llprocesslauncher.cpp llprocessor.cpp @@ -157,6 +158,7 @@ set(llcommon_HEADER_FILES llmetrics.h llmortician.h llnametable.h + lloptioninterface.h llpointer.h llpreprocessor.h llpriqueuemap.h |