diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-04-01 15:33:05 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-04-01 15:33:05 -0700 |
| commit | db0ffdf270f9f9b656333e317a0cf6fadc14a711 (patch) | |
| tree | 6008b6b3c36dd9cd6bd7e51d63aea7210396e7bf /indra/newview/llvoavatarself.cpp | |
| parent | 959ec0c305914ac71caa12920ca81230d5d9a6c4 (diff) | |
| parent | 406b595e8c6811c2550340ba316328289d8b856f (diff) | |
Merge
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
| -rw-r--r-- | indra/newview/llvoavatarself.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index fe6990eae9..c15dbeb8c6 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -87,14 +87,14 @@ using namespace LLVOAvatarDefines; struct LocalTextureData { LocalTextureData() : - mIsBakedReady(FALSE), + mIsBakedReady(false), mDiscard(MAX_DISCARD_LEVEL+1), mImage(NULL), mWearableID(IMG_DEFAULT_AVATAR), mTexEntry(NULL) {} LLPointer<LLViewerFetchedTexture> mImage; - BOOL mIsBakedReady; + bool mIsBakedReady; S32 mDiscard; LLUUID mWearableID; // UUID of the wearable that this texture belongs to, not of the image itself LLTextureEntry *mTexEntry; |