summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorsimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-12-04 15:03:34 -0800
committersimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-12-04 15:03:34 -0800
commit7fe4fbe6741c4a5f140bf1b52ced9957d408a53a (patch)
tree96c5d4021a43b57e6e47cbb34edad12c1e7016b0 /indra/newview/pipeline.cpp
parentfddd386804889f491d51b6ea597f18ec6fd8170c (diff)
parent40e78a80cc293874216cdc8730d93cba8e987052 (diff)
Pull in upstream viewer-development via viewer-lion
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r--indra/newview/pipeline.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 2bcbc0b083..579fc6d104 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -861,6 +861,8 @@ bool LLPipeline::doAllocateScreenBuffer(U32 resX, U32 resY)
}
return ret;
+
+ return ret;
}
bool LLPipeline::allocateScreenBuffer(U32 resX, U32 resY, U32 samples)