diff options
author | callum <none@none> | 2011-10-10 17:32:48 -0700 |
---|---|---|
committer | callum <none@none> | 2011-10-10 17:32:48 -0700 |
commit | 6ad54f22f6ba0fe9f63823d57fd7c15d34e183aa (patch) | |
tree | 5e9baa11f8aa23c527d1e47a6f4d4a75cd8799d6 /indra/newview/CMakeLists.txt | |
parent | 213985ca0d045252ad49d9d45f77d0727fa9008f (diff) | |
parent | 5b1301ea8a0e50f2d15700a7e93be7628f6feec8 (diff) |
Merge with head
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 941cb6b9f9..97ccfeac29 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -168,6 +168,7 @@ set(viewer_SOURCE_FILES llfloaterabout.cpp llfloateranimpreview.cpp llfloaterauction.cpp + llfloateravatar.cpp llfloateravatarpicker.cpp llfloateravatartextures.cpp llfloaterbeacons.cpp @@ -733,6 +734,7 @@ set(viewer_HEADER_FILES llfloaterabout.h llfloateranimpreview.h llfloaterauction.h + llfloateravatar.h llfloateravatarpicker.h llfloateravatartextures.h llfloaterbeacons.h |