diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-11-24 15:05:13 -0800 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-24 15:05:13 -0800 |
commit | fb26dd779613ea088e44fd5d85044698cf782ede (patch) | |
tree | e2908fb32ccc3c9d3b48cece2759b072aff86a62 /indra/newview/CMakeLists.txt | |
parent | 07a396e3119af7dd3cd56f64e066c70f8aa1b5bd (diff) | |
parent | 9e2d78aca1fa96e96b4b324cabfb0efeb26f7397 (diff) |
Merge
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 |