Mesh-development work in progress

2 files changed, 20 insertions, 11 deletions

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index f380d4b183..bf550e9c70 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -5600,6 +5600,26 @@ void LLViewerObject::setAttachmentItemID(const LLUUID &id)
 	mAttachmentItemID = id;
 }
 
+EObjectUpdateType LLViewerObject::getLastUpdateType() const
+{
+	return mLastUpdateType;
+}
+
+void LLViewerObject::setLastUpdateType(EObjectUpdateType last_update_type)
+{
+	mLastUpdateType = last_update_type;
+}
+
+BOOL LLViewerObject::getLastUpdateCached() const
+{
+	return mLastUpdateCached;
+}
+
+void LLViewerObject::setLastUpdateCached(BOOL last_update_cached)
+{
+	mLastUpdateCached = last_update_cached;
+}
+
 const LLUUID &LLViewerObject::extractAttachmentItemID()
 {
 	LLUUID item_id = LLUUID::null;
@@ -5616,16 +5636,6 @@ const LLUUID &LLViewerObject::extractAttachmentItemID()
 	return getAttachmentItemID();
 }
 
-EObjectUpdateType LLViewerObject::getLastUpdateType() const
-{
-	return mLastUpdateType;
-}
-
-void LLViewerObject::setLastUpdateType(EObjectUpdateType last_update_type)
-{
-	mLastUpdateType = last_update_type;
-}
-
 //virtual
 LLVOAvatar* LLViewerObject::getAvatar() const
 {
diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp
index 2188b41a06..10d6b009ae 100644
--- a/indra/newview/llvocache.cpp
+++ b/indra/newview/llvocache.cpp
@@ -648,7 +648,6 @@ void LLVOCache::writeToCache(U64 handle, const LLUUID& id, const LLVOCacheEntry:
 	

 	HeaderEntryInfo* entry;

 	handle_entry_map_t::iterator iter = mHandleEntryMap.find(handle) ;

-	U32 num_handle_entries = mHandleEntryMap.size();

 	if(iter == mHandleEntryMap.end()) //new entry

 	{

 		if(num_handle_entries >= mCacheSize)