diff options
| author | Merov Linden <merov@lindenlab.com> | 2015-03-24 11:54:30 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2015-03-24 11:54:30 -0700 |
| commit | 5160aab492981eae5565c414dbe87070ea04f42d (patch) | |
| tree | 735bedf8c768511a42000144643b731d25c9a434 /indra/newview | |
| parent | 760941d504d1dc6d423b7246a0ea1d1d73aed4a5 (diff) | |
Fix viewer-release merge snaffu. Note that mInitialBakesLoaded (new in viewer-release) is not used and generates a compile error when using the new build tools
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llvoavatarself.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llvoavatarself.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index ae7a233876..4bd24a4923 100755 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -178,7 +178,7 @@ LLVOAvatarSelf::LLVOAvatarSelf(const LLUUID& id, mScreenp(NULL), mLastRegionHandle(0), mRegionCrossingCount(0), - mInitialBakesLoaded(false), + //mInitialBakesLoaded(false), // Value outside legal range, so will always be a mismatch the // first time through. mLastHoverOffsetSent(LLVector3(0.0f, 0.0f, -999.0f)) diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index dc5e64d547..0ff96e0837 100755 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -109,6 +109,7 @@ private: private: LLUUID mInitialBakeIDs[6]; + //bool mInitialBakesLoaded; /******************************************************************************** |