summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-11-04 19:15:12 -0800
committerSteve Bennetts <steve@lindenlab.com>2009-11-04 19:15:12 -0800
commitaf401ac6dc463db477210b0ff100014fbeb50a9a (patch)
tree6bb39558de0208fc05af074fb5efe8498a493c4a /indra/newview/CMakeLists.txt
parent4656c5671cfe523e351b5c91ae45d5026fb69e04 (diff)
parent15df55ecafd2f6d72f25988401ddb7ed58030b79 (diff)
Merge changes from https://hg.aws.productengine.com/secondlife/viewer-2-0/
Diffstat (limited to 'indra/newview/CMakeLists.txt')
-rw-r--r--indra/newview/CMakeLists.txt2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 643f89068f..075f8148e3 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -323,7 +323,6 @@ set(viewer_SOURCE_FILES
llpanellookinfo.cpp
llpanellooks.cpp
llpanelmaininventory.cpp
- llpanelmedia.cpp
llpanelmediasettingsgeneral.cpp
llpanelmediasettingspermissions.cpp
llpanelmediasettingssecurity.cpp
@@ -809,7 +808,6 @@ set(viewer_HEADER_FILES
llpanellookinfo.h
llpanellooks.h
llpanelmaininventory.h
- llpanelmedia.h
llpanelmediasettingsgeneral.h
llpanelmediasettingspermissions.h
llpanelmediasettingssecurity.h