diff options
author | Oz Linden <oz@lindenlab.com> | 2013-01-08 11:24:33 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-01-08 11:24:33 -0500 |
commit | b601bc3cbf5e999b4fd0b0b9ae024397b92cce39 (patch) | |
tree | 87fa88c122b8a31fb13ef4f37a140517d6f34730 /indra | |
parent | a7dbaaa0af643fc5bce0b740a92e69dfb931c6e8 (diff) |
remove duplicated return (merge artifact)
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/pipeline.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
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) |