diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 18:24:07 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 18:24:07 -0800 |
| commit | 9b05fecbf6b3d65dae5a010fc35821dc116a44d0 (patch) | |
| tree | 9c0df85bb3a8b5c4e58655179e1b29ee31594cfc /indra/newview/lllocaltextureobject.cpp | |
| parent | 5ed6e0720af1b6cdf1a983e2c040eeb5d8ae33ba (diff) | |
| parent | db4e46e93d06c03520cb7c781b8e41b6d374414d (diff) | |
automated merge from trunk
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); |