diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-31 16:47:35 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-31 16:47:35 -0400 |
commit | 4047349ade461fa6bac43da2a14c6e7689918aa1 (patch) | |
tree | c1414bf26449ede2ff338b8ab286c19b754697fe /indra/newview/CMakeLists.txt | |
parent | 4aad5ee313f580e08f9689b7ff4c4c088c20f831 (diff) | |
parent | 67316ada5a51e1dc1e4d40a805312dddaa653ae2 (diff) |
merge out latest viewer-autobuild2010 changes
Diffstat (limited to 'indra/newview/CMakeLists.txt')
-rw-r--r-- | indra/newview/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 2574454d96..6897847e10 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -380,6 +380,7 @@ set(viewer_SOURCE_FILES llparcelselection.cpp llparticipantlist.cpp llpatchvertexarray.cpp + llphysicsmotion.cpp llplacesinventorybridge.cpp llplacesinventorypanel.cpp llpopupview.cpp @@ -402,6 +403,7 @@ set(viewer_SOURCE_FILES llscreenchannel.cpp llscriptfloater.cpp llscrollingpanelparam.cpp + llscrollingpanelparambase.cpp llsearchcombobox.cpp llsearchhistory.cpp llsecapi.cpp @@ -915,6 +917,7 @@ set(viewer_HEADER_FILES llparcelselection.h llparticipantlist.h llpatchvertexarray.h + llphysicsmotion.h llplacesinventorybridge.h llplacesinventorypanel.h llpolymesh.h @@ -939,6 +942,7 @@ set(viewer_HEADER_FILES llscreenchannel.h llscriptfloater.h llscrollingpanelparam.h + llscrollingpanelparambase.h llsearchcombobox.h llsearchhistory.h llsecapi.h |