diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-05 13:17:19 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-05 13:17:19 +0000 |
| commit | 6d6fcc46ef219c8b6df1c8707ea22dbd866dc315 (patch) | |
| tree | 97ee5cd51b59a0fc2ebae0017cb8f804637a79c4 /indra/newview/CMakeLists.txt | |
| parent | 95738da3d82b92e82744dbc6b377a3feae2e6441 (diff) | |
| parent | 179f18d1ab5cc93509339684029cf7e4fe0b3eaa (diff) | |
Merge from viewer2voiceparity, conflicts resolved, and I fixed the 'speak' button which is broken on trunk.
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 075f8148e3..2978ef210f 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -376,6 +376,7 @@ set(viewer_SOURCE_FILES llsky.cpp llslurl.cpp llspatialpartition.cpp + llspeakbutton.cpp llspeakers.cpp llsplitbutton.cpp llsprite.cpp @@ -863,6 +864,7 @@ set(viewer_HEADER_FILES llsky.h llslurl.h llspatialpartition.h + llspeakbutton.h llspeakers.h llsplitbutton.h llsprite.h |