diff options
| author | James Cook <james@lindenlab.com> | 2009-11-25 12:31:24 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-25 12:31:24 -0800 |
| commit | 957055396d2ffa3a76b09c60cb9c3e1f73870cbf (patch) | |
| tree | 632ecbdc0c21b0e14eb72f74faa8c04765f54489 /indra/newview/CMakeLists.txt | |
| parent | ef46d4077ca4aad322aabfe545885be136577c8a (diff) | |
| parent | 59eb8a43a467ecaa5a8c2b58bf1abfb8350c0202 (diff) | |
merge in changes from viewer-2-0, manually fixed conflict in llviewermessages.cpp
Diffstat (limited to 'indra/newview/CMakeLists.txt')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 611875a1e2..e632cbaaf2 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -325,7 +325,7 @@ set(viewer_SOURCE_FILES llpanelmediasettingsgeneral.cpp llpanelmediasettingspermissions.cpp llpanelmediasettingssecurity.cpp - llpanelmeprofile.cpp + llpanelme.cpp llpanelobject.cpp llpanelobjectinventory.cpp llpaneloutfitsinventory.cpp @@ -821,7 +821,7 @@ set(viewer_HEADER_FILES llpanelmediasettingsgeneral.h llpanelmediasettingspermissions.h llpanelmediasettingssecurity.h - llpanelmeprofile.h + llpanelme.h llpanelobject.h llpanelobjectinventory.h llpaneloutfitsinventory.h |