diff options
author | Oz Linden <oz@lindenlab.com> | 2013-01-08 09:45:27 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-01-08 09:45:27 -0500 |
commit | a7dbaaa0af643fc5bce0b740a92e69dfb931c6e8 (patch) | |
tree | 3eddbd3f421f430c9b03487261e89c95017657b9 /indra/newview/CMakeLists.txt | |
parent | 0d12d171cf20c63a45e7ad0989e65d05aabb86ea (diff) | |
parent | 77abdd04a4a390049c2143e1d87542b9b2a06c86 (diff) |
merge changes for DRTVWR-250
Diffstat (limited to 'indra/newview/CMakeLists.txt')
-rw-r--r--[-rwxr-xr-x] | indra/newview/CMakeLists.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index dff2c04fbc..0197ac794f 100755..100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -336,7 +336,6 @@ set(viewer_SOURCE_FILES llmarketplacenotifications.cpp llmediactrl.cpp llmediadataclient.cpp - llmemoryview.cpp llmenuoptionpathfindingrebakenavmesh.cpp llmeshrepository.cpp llmimetypes.cpp @@ -913,7 +912,6 @@ set(viewer_HEADER_FILES llmarketplacenotifications.h llmediactrl.h llmediadataclient.h - llmemoryview.h llmenuoptionpathfindingrebakenavmesh.h llmeshrepository.h llmimetypes.h |