summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolsky.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2013-09-19 13:13:37 -0400
committerMonty Brandenberg <monty@lindenlab.com>2013-09-19 13:13:37 -0400
commiteaef5e63d5f5e3177fbd13de41aea12340f2fa30 (patch)
tree4da9c9af2741b2d33eb05cebe0291e50aada88ba /indra/newview/lldrawpoolsky.cpp
parent195d319f65239238577ae15c22188da3839ae5cf (diff)
parentad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff)
Merge. Pull in viewer-release after materials viewer release.
Diffstat (limited to 'indra/newview/lldrawpoolsky.cpp')
-rwxr-xr-xindra/newview/lldrawpoolsky.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolsky.cpp b/indra/newview/lldrawpoolsky.cpp
index 7f7d9f65c6..ef8bdc3304 100755
--- a/indra/newview/lldrawpoolsky.cpp
+++ b/indra/newview/lldrawpoolsky.cpp
@@ -155,3 +155,4 @@ void LLDrawPoolSky::renderSkyCubeFace(U8 side)
void LLDrawPoolSky::endRenderPass( S32 pass )
{
}
+