From a74b5dfa923f8eeccc9b786143f0f832de3ad450 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 4 Jun 2013 19:45:33 -0700
Subject: SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
 fixed mem stat tracking...now properly tracks memory footprint with floating
 point precision cleaned up macros for unit declaration renamed units to SI
 standard for 1024 multiples (kibibytes, etc) fixed units output for scene
 monitor dump

---
 indra/llimage/llimage.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/llimage')

diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index e7e274ff03..80634b3887 100644
--- a/indra/llimage/llimage.cpp
+++ b/indra/llimage/llimage.cpp
@@ -159,7 +159,7 @@ void LLImageBase::sanityCheck()
 void LLImageBase::deleteData()
 {
 	FREE_MEM(sPrivatePoolp, mData) ;
-	memDisclaim(mDataSize);
+	memDisclaimAmount(mDataSize);
 	mData = NULL;
 	mDataSize = 0;
 }
@@ -203,7 +203,7 @@ U8* LLImageBase::allocateData(S32 size)
 			mBadBufferAllocation = true ;
 		}
 		mDataSize = size;
-		memClaim(mDataSize);
+		memClaimAmount(mDataSize);
 	}
 
 	return mData;
@@ -225,9 +225,9 @@ U8* LLImageBase::reallocateData(S32 size)
 		FREE_MEM(sPrivatePoolp, mData) ;
 	}
 	mData = new_datap;
-	memDisclaim(mDataSize);
+	memDisclaimAmount(mDataSize);
 	mDataSize = size;
-	memClaim(mDataSize);
+	memClaimAmount(mDataSize);
 	return mData;
 }
 
@@ -1589,9 +1589,9 @@ static void avg4_colors2(const U8* a, const U8* b, const U8* c, const U8* d, U8*
 void LLImageBase::setDataAndSize(U8 *data, S32 size)
 { 
 	ll_assert_aligned(data, 16);
-	memDisclaim(mDataSize);
+	memDisclaimAmount(mDataSize);
 	mData = data; mDataSize = size; 
-	memClaim(mDataSize);
+	memClaimAmount(mDataSize);
 }	
 
 //static
-- 
cgit v1.2.3