1 files changed, 13 insertions, 26 deletions

diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp
index 99ab854293..f0e9cee101 100644
--- a/indra/newview/lltextureview.cpp
+++ b/indra/newview/lltextureview.cpp
@@ -119,8 +119,8 @@ public:
 			LLTextureBar* bar2p = (LLTextureBar*)i2;
 			LLViewerFetchedTexture *i1p = bar1p->mImagep;
 			LLViewerFetchedTexture *i2p = bar2p->mImagep;
-			F32 pri1 = i1p->getDecodePriority(); // i1p->mRequestedDownloadPriority
-			F32 pri2 = i2p->getDecodePriority(); // i2p->mRequestedDownloadPriority
+			F32 pri1 = i1p->getMaxVirtualSize();
+			F32 pri2 = i2p->getMaxVirtualSize();
 			if (pri1 > pri2)
 				return true;
 			else if (pri2 > pri1)
@@ -179,7 +179,7 @@ void LLTextureBar::draw()
 	{
 		color = LLColor4::magenta; // except none and alm
 	}
-	else if (mImagep->getDecodePriority() <= 0.0f)
+	else if (mImagep->getMaxVirtualSize() <= 0.0f)
 	{
 		color = LLColor4::grey; color[VALPHA] = .7f;
 	}
@@ -204,26 +204,13 @@ void LLTextureBar::draw()
 	std::string uuid_str;
 	mImagep->mID.toString(uuid_str);
 	uuid_str = uuid_str.substr(0,7);
-	if (mTextureView->mOrderFetch)
-	{
-		tex_str = llformat("%s %7.0f %d(%d) 0x%08x(%8.0f)",
-						   uuid_str.c_str(),
-						   mImagep->mMaxVirtualSize,
-						   mImagep->mDesiredDiscardLevel,
-						   mImagep->mRequestedDiscardLevel,
-						   mImagep->mFetchPriority,
-						   mImagep->getDecodePriority());
-	}
-	else
-	{
-		tex_str = llformat("%s %7.0f %d(%d) %8.0f(0x%08x)",
-						   uuid_str.c_str(),
-						   mImagep->mMaxVirtualSize,
-						   mImagep->mDesiredDiscardLevel,
-						   mImagep->mRequestedDiscardLevel,
-						   mImagep->getDecodePriority(),
-						   mImagep->mFetchPriority);
-	}
+	
+    tex_str = llformat("%s %7.0f %d(%d)",
+        uuid_str.c_str(),
+        mImagep->mMaxVirtualSize,
+        mImagep->mDesiredDiscardLevel,
+        mImagep->mRequestedDiscardLevel);
+
 
 	LLFontGL::getFontMonospace()->renderUTF8(tex_str, 0, title_x1, getRect().getHeight(),
 									 color, LLFontGL::LEFT, LLFontGL::TOP);
@@ -547,7 +534,7 @@ void LLGLTexMemBar::draw()
     U32 texFetchLatMed = U32(recording.getMean(LLTextureFetch::sTexFetchLatency).value() * 1000.0f);
     U32 texFetchLatMax = U32(recording.getMax(LLTextureFetch::sTexFetchLatency).value() * 1000.0f);
 
-    text = llformat("GL Free: %d Sys Free: %d MB FBO: %d MB Bias: %.2f Cache: %.1f/%.1f MB",
+    text = llformat("GL Free: %d MB Sys Free: %d MB FBO: %d MB Bias: %.2f Cache: %.1f/%.1f MB",
                     gViewerWindow->getWindow()->getAvailableVRAMMegabytes(),
                     LLMemory::getAvailableMemKB()/1024,
 					LLRenderTarget::sBytesAllocated/(1024*1024),
@@ -830,7 +817,7 @@ void LLTextureView::draw()
 				LL_INFOS() << imagep->getID()
 						<< "\t" << tex_mem
 						<< "\t" << imagep->getBoostLevel()
-						<< "\t" << imagep->getDecodePriority()
+						<< "\t" << imagep->getMaxVirtualSize()
 						<< "\t" << imagep->getWidth()
 						<< "\t" << imagep->getHeight()
 						<< "\t" << cur_discard
@@ -850,7 +837,7 @@ void LLTextureView::draw()
 			}
 			else
 			{
-				pri = imagep->getDecodePriority();
+				pri = imagep->getMaxVirtualSize();
 			}
 			pri = llclamp(pri, 0.0f, HIGH_PRIORITY-1.f);