summaryrefslogtreecommitdiff
path: root/indra/llrender/llrendertarget.cpp
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2012-12-11 16:38:10 -0500
committerLogan Dethrow <log@lindenlab.com>2012-12-11 16:38:10 -0500
commit03025733484f7f1ea46d0356e65b0d142bc1dbdb (patch)
treed48902f9fab2fdc4d15850ffee3d6860f550bcb4 /indra/llrender/llrendertarget.cpp
parentedcdce226a7ff599e43c89fe7e4d37350650ae96 (diff)
parent798377b076fbce895ba2075417107de0da10b9ca (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/llrender/llrendertarget.cpp')
-rw-r--r--indra/llrender/llrendertarget.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp
index c1b96a43da..5fb4fc8e52 100644
--- a/indra/llrender/llrendertarget.cpp
+++ b/indra/llrender/llrendertarget.cpp
@@ -579,3 +579,5 @@ void LLRenderTarget::getViewport(S32* viewport)
viewport[3] = mResY;
}
+
+