summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-01-13 14:54:35 -0500
committerOz Linden <oz@lindenlab.com>2015-01-13 14:54:35 -0500
commit23ec88963169df93fc7a8d9a046e77c24aa396f3 (patch)
tree0b8f080f45959e84b2cff1009a16c1c37a8e5ad9 /indra/newview
parent6f3cf79a3afa66db229a1c1068e0c01f246f0b79 (diff)
changes to fix compiler warnings merged in from viewer-release
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llvoavatarself.cpp3
-rwxr-xr-xindra/newview/llvoavatarself.h1
2 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 0be8df349d..170a8c41f4 100755
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -158,8 +158,7 @@ LLVOAvatarSelf::LLVOAvatarSelf(const LLUUID& id,
LLVOAvatar(id, pcode, regionp),
mScreenp(NULL),
mLastRegionHandle(0),
- mRegionCrossingCount(0),
- mInitialBakesLoaded(false)
+ mRegionCrossingCount(0)
{
mMotionController.mIsSelf = TRUE;
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h
index 13ffc057b0..7f641b6242 100755
--- a/indra/newview/llvoavatarself.h
+++ b/indra/newview/llvoavatarself.h
@@ -105,7 +105,6 @@ private:
private:
LLUUID mInitialBakeIDs[6];
- bool mInitialBakesLoaded;
/********************************************************************************