diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-28 13:58:00 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-28 13:58:00 +0200 |
| commit | 14caf5475b8963e6b6689e96a0a7a64e13bb1887 (patch) | |
| tree | 8d08ab19e287fca6a07622560669573fb9750181 /indra/newview/lllocaltextureobject.cpp | |
| parent | 33a417dd2d93573f7aafc194eefdad5339bccf1d (diff) | |
| parent | 52bd13e1f5cd661ff359e36be8c0496d06c19d1c (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lllocaltextureobject.cpp')
| -rw-r--r-- | indra/newview/lllocaltextureobject.cpp | 4 |
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); |