diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index ce95d9c69..725d661cf 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1776,7 +1776,7 @@ void LLImageGL::calcAlphaChannelOffsetAndStride() } } -std::map > > sTextureMaskMap; +//std::map > > sTextureMaskMap; void LLImageGL::analyzeAlpha(const void* data_in, U32 w, U32 h) { if(!mNeedsAlphaAndPickMask || !mCanMask) @@ -1897,7 +1897,7 @@ void LLImageGL::analyzeAlpha(const void* data_in, U32 w, U32 h) mMaskRMSE = sqrt(sum)/255.0; - std::list > &data = sTextureMaskMap[getTexName()]; + /*std::list > &data = sTextureMaskMap[getTexName()]; data.clear(); data.push_back(std::make_pair("RMSE", llformat("%f",mMaskRMSE))); data.push_back(std::make_pair(" sum", llformat("%lf",sum))); @@ -1908,7 +1908,7 @@ void LLImageGL::analyzeAlpha(const void* data_in, U32 w, U32 h) data.push_back(std::make_pair(" stride", llformat("%i",S32(mAlphaOffset)))); data.push_back(std::make_pair(" split", llformat("%u|%u|%u",lowerhalftotal,midrangetotal,upperhalftotal))); data.push_back(std::make_pair(" alphatotal", llformat("%u",alphatotal))); - data.push_back(std::make_pair(" alphatotal/48", llformat("%u",length/48))); + data.push_back(std::make_pair(" alphatotal/48", llformat("%u",length/48)));*/ } diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index f0b74c6e1..69be5d90d 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -259,7 +259,7 @@ extern void toggle_debug_menus(void*); // LLDebugText // -extern std::map > > sTextureMaskMap; +//extern std::map > > sTextureMaskMap; class LLDebugText { @@ -356,7 +356,7 @@ public: LLViewerTexture* imagep = obj->getTEImage(te); if(imagep && imagep != (LLViewerTexture*)LLViewerFetchedTexture::sDefaultImagep.get()) { - LLGLuint tex = imagep->getTexName(); + /*LLGLuint tex = imagep->getTexName(); std::map > >::iterator it = sTextureMaskMap.find(tex); if(it != sTextureMaskMap.end()) { @@ -365,7 +365,7 @@ public: { addText(xpos, ypos, llformat(" %s: %s", it2->first.c_str(), it2->second.c_str())); ypos += y_inc; } - } + }*/ static const LLCachedControl use_rmse_auto_mask("SHUseRMSEAutoMask",false); static const LLCachedControl auto_mask_max_rmse("SHAutoMaskMaxRMSE",.09f); addText(xpos, ypos, llformat("Mask: %s", imagep->getIsAlphaMask(use_rmse_auto_mask ? auto_mask_max_rmse : -1.f) ? "TRUE":"FALSE")); ypos += y_inc;