diff options
| author | Neal Orman <nyx@lindenlab.com> | 2009-10-16 17:56:30 +0000 |
|---|---|---|
| committer | Neal Orman <nyx@lindenlab.com> | 2009-10-16 17:56:30 +0000 |
| commit | d08b0b6ae8bcd452a3d707ac153107d0f1523df8 (patch) | |
| tree | 3caac3468a18b105e5aa5eb53cd13ed416c1a48d /indra/newview/CMakeLists.txt | |
| parent | 087897b1f837872fc02822595e5dd47fabf3b7e8 (diff) | |
merging in new wearable infrastructure to get a step closer to eventually supporting multiple wearables per type. Merge tested and compiles/working on linux and windows - no obvious regressions on appearance or appearance editor. Merge generated no conflicts due to being tested in fresh re-branch in avatar-pipeline/multiple-textures-12. Merge perfomed with following command:
svn merge -r 136489:136510 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/multiple-textures-12 .
Progress can be tracked in DEV-32551.
-Nyx
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 c402c3979a..37acdc3cef 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -303,6 +303,7 @@ set(viewer_SOURCE_FILES llpaneldirland.cpp llpaneldirpeople.cpp llpaneldirplaces.cpp + llpaneleditwearable.cpp llpanelevent.cpp llpanelface.cpp llpanelgroup.cpp @@ -358,6 +359,7 @@ set(viewer_SOURCE_FILES llremoteparcelrequest.cpp llsavedsettingsglue.cpp llscreenchannel.cpp + llscrollingpanelparam.cpp llsearchcombobox.cpp llsearchhistory.cpp llselectmgr.cpp @@ -767,6 +769,7 @@ set(viewer_HEADER_FILES llpaneldirland.h llpaneldirpeople.h llpaneldirplaces.h + llpaneleditwearable.h llpanelevent.h llpanelface.h llpanelgroup.h @@ -823,6 +826,7 @@ set(viewer_HEADER_FILES llresourcedata.h llrootview.h llscreenchannel.h + llscrollingpanelparam.h llsavedsettingsglue.h llsearchcombobox.h llsearchhistory.h |