merge changes for 5.0.8-release

1 files changed, 5 insertions, 1 deletions

diff --git a/indra/newview/llvocache.h b/indra/newview/llvocache.h
index 7aabde1b2d..7d450c5231 100644
--- a/indra/newview/llvocache.h
+++ b/indra/newview/llvocache.h
@@ -237,9 +237,10 @@ private:
 
 	struct HeaderMetaInfo
 	{
-		HeaderMetaInfo() : mVersion(0){}
+		HeaderMetaInfo() : mVersion(0), mAddressSize(0) {}
 
 		U32 mVersion;
+		U32 mAddressSize;
 	};
 
 	struct header_entry_less
@@ -267,6 +268,9 @@ public:
 
 	void setReadOnly(bool read_only) {mReadOnly = read_only;} 
 
+	U32 getCacheEntries() { return mNumEntries; }
+	U32 getCacheEntriesMax() { return mCacheSize; }
+
 private:
 	void setDirNames(ELLPath location);	
 	// determine the cache filename for the region from the region handle