diff options
author | richard <none@none> | 2010-01-11 14:48:28 -0800 |
---|---|---|
committer | richard <none@none> | 2010-01-11 14:48:28 -0800 |
commit | 34f33212de1a69281bc5cb639b035d9465d8f846 (patch) | |
tree | f245e1ffc4348665f01b6532717bfa31516966ff /indra/newview/CMakeLists.txt | |
parent | fb9a20802f3386bee82a8bd9a479f209374fa9a4 (diff) | |
parent | 3e5f5a205034cde29ef80a9230d8cd4867e6dec5 (diff) |
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 62cb8380c0..39594bcf3e 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -212,7 +212,6 @@ set(viewer_SOURCE_FILES llfloaterurldisplay.cpp llfloaterurlentry.cpp llfloatervoicedevicesettings.cpp - llfloatervolumepulldown.cpp llfloaterwater.cpp llfloaterwhitelistentry.cpp llfloaterwindlight.cpp @@ -347,6 +346,7 @@ set(viewer_SOURCE_FILES llpanelshower.cpp llpanelteleporthistory.cpp llpanelvolume.cpp + llpanelvolumepulldown.cpp llparcelselection.cpp llparticipantlist.cpp llpatchvertexarray.cpp @@ -848,6 +848,7 @@ set(viewer_HEADER_FILES llpanelshower.h llpanelteleporthistory.h llpanelvolume.h + llpanelvolumepulldown.h llparcelselection.h llparticipantlist.h llpatchvertexarray.h |