diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-10 10:17:39 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-10 10:17:39 +0100 |
commit | 544ebaddf8e16f34fd6f44bcc2a8cdfca9a37074 (patch) | |
tree | 6297885e42efef9219282b22f40c20682f84444a /indra/newview/CMakeLists.txt | |
parent | 72e597a6f9e6dacbb41383ee8ee29e55acff4b74 (diff) | |
parent | 6b77ce904eedfa8bbcc9e2fd2d9f96e4f0093b95 (diff) |
merge STORM-96 / STORM-92 (as part of vwr-20694).
Diffstat (limited to 'indra/newview/CMakeLists.txt')
-rw-r--r-- | indra/newview/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 630902c48f..d6622f164e 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -203,6 +203,7 @@ set(viewer_SOURCE_FILES llfloatersearch.cpp llfloatersellland.cpp llfloatersettingsdebug.cpp + llfloatersidetraytab.cpp llfloatersnapshot.cpp llfloatertelehub.cpp llfloatertestinspectors.cpp @@ -727,6 +728,7 @@ set(viewer_HEADER_FILES llfloatersearch.h llfloatersellland.h llfloatersettingsdebug.h + llfloatersidetraytab.h llfloatersnapshot.h llfloatertelehub.h llfloatertestinspectors.h |