From 536e38ad51b89808f26d8e3cd107fe093862d22a Mon Sep 17 00:00:00 2001
From: David Parks <davep@lindenlab.com>
Date: Tue, 22 Sep 2009 11:11:45 +0000
Subject: Merging render-pipeline-6-qa-2 into viewer-2

Self reviewed.
---
 indra/newview/llvlcomposition.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/llvlcomposition.cpp')

diff --git a/indra/newview/llvlcomposition.cpp b/indra/newview/llvlcomposition.cpp
index f26ba6f46e..d124cbcdce 100644
--- a/indra/newview/llvlcomposition.cpp
+++ b/indra/newview/llvlcomposition.cpp
@@ -448,6 +448,10 @@ BOOL LLVLComposition::generateTexture(const F32 x, const F32 y,
 		}
 	}
 
+	if (!texturep->hasGLTexture())
+	{
+		texturep->createGLTexture(0, raw);
+	}
 	texturep->setSubImage(raw, tex_x_begin, tex_y_begin, tex_x_end - tex_x_begin, tex_y_end - tex_y_begin);
 	LLSurface::sTextureUpdateTime += gen_timer.getElapsedTimeF32();
 	LLSurface::sTexelsUpdated += (tex_x_end - tex_x_begin) * (tex_y_end - tex_y_begin);
-- 
cgit v1.2.3