diff options
author | skolb <none@none> | 2010-03-08 14:54:54 -0800 |
---|---|---|
committer | skolb <none@none> | 2010-03-08 14:54:54 -0800 |
commit | 78abe4f5ffb02e14cd98f049b8100d20a82f3b1c (patch) | |
tree | 0c471654bd00737375e91f040d758716c82bffb2 /indra/newview/CMakeLists.txt | |
parent | f39a87ef8384ede25a6597e678ac7609e9e64cc5 (diff) | |
parent | 2aa9ecb60235c96a42f3719fab9dbc6ea1bf50db (diff) |
Local merge
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 14eb75e457..8ad3b2085d 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -347,6 +347,7 @@ set(viewer_SOURCE_FILES llpatchvertexarray.cpp llplacesinventorybridge.cpp llplacesinventorypanel.cpp + llpopupview.cpp llpolymesh.cpp llpolymorph.cpp llpreview.cpp @@ -844,6 +845,7 @@ set(viewer_HEADER_FILES llplacesinventorypanel.h llpolymesh.h llpolymorph.h + llpopupview.h llpreview.h llpreviewanim.h llpreviewgesture.h |