diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-01-13 14:54:35 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-01-13 14:54:35 -0500 |
| commit | 23ec88963169df93fc7a8d9a046e77c24aa396f3 (patch) | |
| tree | 0b8f080f45959e84b2cff1009a16c1c37a8e5ad9 /indra | |
| parent | 6f3cf79a3afa66db229a1c1068e0c01f246f0b79 (diff) | |
changes to fix compiler warnings merged in from viewer-release
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/llprimitive/llmodel.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/llvoavatarself.cpp | 3 | ||||
| -rwxr-xr-x | indra/newview/llvoavatarself.h | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index aa8dd7697c..caabbf997f 100755 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -191,7 +191,7 @@ LLModel::EModelStatus load_face_from_dom_triangles(std::vector<LLVolumeFace>& fa U32 tc_count = (tc_source && tc_source->getFloat_array()) ? tc.getCount() : 0; U32 norm_count = (norm_source && norm_source->getFloat_array()) ? n.getCount(): 0; - if ((vertex_count == 0)) + if (vertex_count == 0) { LL_WARNS() << "Unable to process mesh with empty position array; invalid model." << LL_ENDL; return LLModel::BAD_ELEMENT; 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; /******************************************************************************** |