Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting

2013-05-30 17:36:05 -06:00 · 2013-05-30 17:36:05 -06:00 · ee0087709a
parent fe79595916 626d5e3b3d
commit ee0087709a
1 changed files with 1 additions and 1 deletions
--- a/indra/newview/llvocache.cpp
+++ b/indra/newview/llvocache.cpp
@ -167,7 +167,7 @@ LLVOCacheEntry::LLVOCacheEntry(LLAPRFile* apr_file)
 LLVOCacheEntry::~LLVOCacheEntry()
 {
 	mDP.freeBuffer();
-	llassert(mState == INACTIVE);
+	//llassert(mState == INACTIVE);
 }

 //virtual