From 57db08d7927a4a93b8825405201e9e21efb8c756 Mon Sep 17 00:00:00 2001
From: "simon@Simon-PC.lindenlab.com" <simon@Simon-PC.lindenlab.com>
Date: Tue, 4 Dec 2012 17:45:19 -0800
Subject: [PATCH] Fix merge breakage
---
indra/newview/CMakeLists.txt | 2 --
indra/newview/pipeline.cpp | 2 --
2 files changed, 4 deletions(-)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index b97b3cc3006..b569808a063 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 579fc6d1045..2bcbc0b0836 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)
--
GitLab