From b601bc3cbf5e999b4fd0b0b9ae024397b92cce39 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 8 Jan 2013 11:24:33 -0500
Subject: remove duplicated return (merge artifact)

---
 indra/newview/pipeline.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 62b882adbd..765f2b3a5a 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -863,8 +863,6 @@ LLPipeline::eFBOStatus LLPipeline::doAllocateScreenBuffer(U32 resX, U32 resY)
 	}
 
 	return ret;
-
-	return ret;
 }
 
 bool LLPipeline::allocateScreenBuffer(U32 resX, U32 resY, U32 samples)
-- 
cgit v1.2.3