diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-05-30 17:36:05 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-05-30 17:36:05 -0600 |
| commit | ee0087709afe05a9fe38e3da743421faead9e02f (patch) | |
| tree | 5f6b86dd56f080b68189418a7514394ab5dcc8ca /indra | |
| parent | fe7959591633e4c6bda570c6fd19d7fdfec15454 (diff) | |
| parent | 626d5e3b3d935e0ba616408b1736bd10f5ea9990 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llvocache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp index bcd9dda652..5e2d2efc5e 100644 --- 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 |