diff options
| author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-12-04 17:45:19 -0800 |
|---|---|---|
| committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-12-04 17:45:19 -0800 |
| commit | 57db08d7927a4a93b8825405201e9e21efb8c756 (patch) | |
| tree | f2b4d020ac42e6830e85db6c2ef90a30c6e90baf /indra | |
| parent | 7fe4fbe6741c4a5f140bf1b52ced9957d408a53a (diff) | |
Fix merge breakage
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index b97b3cc300..b569808a06 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -337,7 +337,6 @@ set(viewer_SOURCE_FILES llmarketplacenotifications.cpp llmediactrl.cpp llmediadataclient.cpp - llmemoryview.cpp llmenuoptionpathfindingrebakenavmesh.cpp llmeshrepository.cpp llmimetypes.cpp @@ -914,7 +913,6 @@ set(viewer_HEADER_FILES llmarketplacenotifications.h llmediactrl.h llmediadataclient.h - llmemoryview.h llmenuoptionpathfindingrebakenavmesh.h llmeshrepository.h llmimetypes.h diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 579fc6d104..2bcbc0b083 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -861,8 +861,6 @@ bool LLPipeline::doAllocateScreenBuffer(U32 resX, U32 resY) } return ret; - - return ret; } bool LLPipeline::allocateScreenBuffer(U32 resX, U32 resY, U32 samples) |