livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add conditional to suppress unused variable warning in Release builds

meow-7.2.2
Oz Linden 2013-01-04 14:12:05 -05:00
parent 80b734575d
commit 8b78b9960a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llmaterialmgr.cpp
View File

@ -384,20 +384,22 @@ void LLMaterialMgr::onPutResponse(bool success, const LLSD& content)
for (LLSD::array_const_iterator faceIter = response_data.beginArray(); faceIter != response_data.endArray(); ++faceIter)
{
const LLSD& face_data = *faceIter;
# ifndef LL_RELEASE_FOR_DOWNLOAD
const LLSD& face_data = *faceIter; // conditional to avoid unused variable warning
# endif
llassert(face_data.isMap());
llassert(face_data.has(MATERIALS_CAP_OBJECT_ID_FIELD));
llassert(face_data[MATERIALS_CAP_OBJECT_ID_FIELD].isInteger());
// U32 local_id = face_data[MATERIALS_CAP_OBJECT_ID_FIELD].asInteger();
// U32 local_id = face_data[MATERIALS_CAP_OBJECT_ID_FIELD].asInteger();
llassert(face_data.has(MATERIALS_CAP_FACE_FIELD));
llassert(face_data[MATERIALS_CAP_FACE_FIELD].isInteger());
// S32 te = face_data[MATERIALS_CAP_FACE_FIELD].asInteger();
// S32 te = face_data[MATERIALS_CAP_FACE_FIELD].asInteger();
llassert(face_data.has(MATERIALS_CAP_MATERIAL_ID_FIELD));
llassert(face_data[MATERIALS_CAP_MATERIAL_ID_FIELD].isBinary());
// LLMaterialID material_id(face_data[MATERIALS_CAP_MATERIAL_ID_FIELD].asBinary());
// LLMaterialID material_id(face_data[MATERIALS_CAP_MATERIAL_ID_FIELD].asBinary());
// *TODO: do we really still need to process this?
}