diff options
| author | Callum Prentice <callum@lindenlab.com> | 2016-12-21 11:22:39 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2016-12-21 11:22:39 -0800 |
| commit | 60cbea49630e0caf27f3a13e16150d3538e6a6d1 (patch) | |
| tree | 7cb62301733352bc304297b4486be37c4919e8d1 /indra/newview/llmaterialmgr.cpp | |
| parent | 84bf05e003d7f7aa7c7cc491b9496d78ffaac4b4 (diff) | |
| parent | a2a5bdf4b58e398f357b865ba49d7f8d380a0428 (diff) | |
Automated merge with lindenlab/viewer64 and lindenlab/nat_viewer64
Diffstat (limited to 'indra/newview/llmaterialmgr.cpp')
| -rw-r--r-- | indra/newview/llmaterialmgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmaterialmgr.cpp b/indra/newview/llmaterialmgr.cpp index f996557c17..ccbe13fb50 100644 --- a/indra/newview/llmaterialmgr.cpp +++ b/indra/newview/llmaterialmgr.cpp @@ -531,7 +531,7 @@ void LLMaterialMgr::onPutResponse(bool success, const LLSD& content) LL_DEBUGS("Materials") << "response has "<< response_data.size() << " materials" << LL_ENDL; for (LLSD::array_const_iterator faceIter = response_data.beginArray(); faceIter != response_data.endArray(); ++faceIter) { -# ifndef LL_RELEASE_FOR_DOWNLOAD +# ifdef SHOW_ASSERT // same condition that controls llassert() const LLSD& face_data = *faceIter; // conditional to avoid unused variable warning # endif llassert(face_data.isMap()); |