diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-24 18:28:19 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-24 18:28:19 -0800 |
| commit | a9867b6437efd07ef9b18315d61155bd10860e13 (patch) | |
| tree | d059f1d6a6809acbedd5ba2ea72c4f88acee2b1b /indra/newview/CMakeLists.txt | |
| parent | 6bb43e1369d957a041c796120e87a89ff3fa10ee (diff) | |
| parent | 8a2404fa3341db0bd7a60459e008b8a3c6afad03 (diff) | |
Automated merge
Diffstat (limited to 'indra/newview/CMakeLists.txt')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 7585d51da4..92399c4e0f 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -213,7 +213,6 @@ set(viewer_SOURCE_FILES llfloaterurldisplay.cpp llfloaterurlentry.cpp llfloatervoicedevicesettings.cpp - llfloatervolumepulldown.cpp llfloaterwater.cpp llfloaterwhitelistentry.cpp llfloaterwindlight.cpp @@ -349,6 +348,7 @@ set(viewer_SOURCE_FILES llpanelshower.cpp llpanelteleporthistory.cpp llpanelvolume.cpp + llpanelvolumepulldown.cpp llparcelselection.cpp llparticipantlist.cpp llpatchvertexarray.cpp @@ -855,6 +855,7 @@ set(viewer_HEADER_FILES llpanelshower.h llpanelteleporthistory.h llpanelvolume.h + llpanelvolumepulldown.h llparcelselection.h llparticipantlist.h llpatchvertexarray.h |