summaryrefslogtreecommitdiff
path: root/indra/newview/lllocaltextureobject.cpp
diff options
context:
space:
mode:
authorYchebotarev ProductEngine <ychebotarev@productengine.com>2010-01-29 18:01:02 +0200
committerYchebotarev ProductEngine <ychebotarev@productengine.com>2010-01-29 18:01:02 +0200
commit675df36965c346f323bb2025cd832a4dc7c9cdce (patch)
treecd4f950defd428e37340229013502d8d8ee48c88 /indra/newview/lllocaltextureobject.cpp
parent67d006e404d830931db17814e8da38cc55332152 (diff)
parent86609394caf1ebb20dd90de37b9af1471ae8aa20 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/lllocaltextureobject.cpp')
-rw-r--r--indra/newview/lllocaltextureobject.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lllocaltextureobject.cpp b/indra/newview/lllocaltextureobject.cpp
index 6bcbe6f58c..69eb5fce2f 100644
--- a/indra/newview/lllocaltextureobject.cpp
+++ b/indra/newview/lllocaltextureobject.cpp
@@ -47,7 +47,9 @@ LLLocalTextureObject::LLLocalTextureObject() :
mImage = NULL;
}
-LLLocalTextureObject::LLLocalTextureObject(LLViewerFetchedTexture* image, const LLUUID& id)
+LLLocalTextureObject::LLLocalTextureObject(LLViewerFetchedTexture* image, const LLUUID& id) :
+ mIsBakedReady(FALSE),
+ mDiscard(MAX_DISCARD_LEVEL+1)
{
mImage = image;
gGL.getTexUnit(0)->bind(mImage);