diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-01 20:49:26 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-01 20:49:26 +0300 |
| commit | b52384d9ef81ed91b52db853af349a1a8ec8bfdb (patch) | |
| tree | aa6d272de0228428d0217aa7f61fbbc84eddb5da /indra/llcommon/CMakeLists.txt | |
| parent | 19ff86fabd84ba45bbbdfd1fa5393fb9ab89dddf (diff) | |
| parent | 167e45e309ebeaccb346b8ca05884b8e10bf05eb (diff) | |
Merge branch 'master' into DRTVWR-522-maint
# Conflicts:
# indra/newview/lltoolpie.cpp
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 0a22942dfd..6f9c2ee230 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -71,6 +71,7 @@ set(llcommon_SOURCE_FILES llinitparam.cpp llinitdestroyclass.cpp llinstancetracker.cpp + llkeybind.cpp llleap.cpp llleaplistener.cpp llliveappconfig.cpp @@ -182,6 +183,7 @@ set(llcommon_HEADER_FILES llinitdestroyclass.h llinitparam.h llinstancetracker.h + llkeybind.h llkeythrottle.h llleap.h llleaplistener.h |