summaryrefslogtreecommitdiff
path: root/indra/newview/llvlcomposition.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2009-09-26 18:08:24 -0400
committerNat Goodspeed <nat@lindenlab.com>2009-09-26 18:08:24 -0400
commitbc4444cd78067cbf11d3ffb210375a31a33f96bd (patch)
treed9b8e78db237869e630fec6c71335d1294cec101 /indra/newview/llvlcomposition.cpp
parent8ddc0c0ac43e9d10bf0262cd1ab3c0e79808fc14 (diff)
parent09bf3c1fec107e9e66514837d208ef62a6b67b91 (diff)
Merge into viewer/viewer-20 yesterday's lindenlab/svn-imports-viewer-20
Diffstat (limited to 'indra/newview/llvlcomposition.cpp')
-rw-r--r--indra/newview/llvlcomposition.cpp4
1 files changed, 4 insertions, 0 deletions
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);