diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-03-23 22:34:34 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-03-23 22:34:34 -0400 |
| commit | 794ae5cdcadcfaa655815bfa1e6c6823e03ee1f6 (patch) | |
| tree | df04ccbc14141952e12797fb5d7860fae4eaf18a /indra/newview | |
| parent | 8e21b24a079684304b02485d8f28e9be8f16e6a0 (diff) | |
correct merge error
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llvoavatarself.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index ff718b2c70..1e9945b514 100755 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -177,8 +177,7 @@ LLVOAvatarSelf::LLVOAvatarSelf(const LLUUID& id, LLVOAvatar(id, pcode, regionp), mScreenp(NULL), mLastRegionHandle(0), - mRegionCrossingCount(0) - mInitialBakesLoaded(false), + mRegionCrossingCount(0), // Value outside legal range, so will always be a mismatch the // first time through. mLastHoverOffsetSent(LLVector3(0.0f, 0.0f, -999.0f)) |