diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2014-01-31 18:25:18 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2014-01-31 18:25:18 -0700 |
| commit | 01f8595bb216b93fd54be45ab06a426b23099c87 (patch) | |
| tree | a19f9509985384ceb78e5db11c49d452b455c803 /indra/newview/llviewerregion.h | |
| parent | 5df86c9a6e258221440a775e229a5be25a4b7e51 (diff) | |
| parent | b49170b732e6e4b2cf11b40c12b3d75a8709cf5c (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llviewerregion.h')
| -rwxr-xr-x | indra/newview/llviewerregion.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index 7ce191fe8f..7f6a8186a5 100755 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -232,7 +232,7 @@ public: void idleUpdate(F32 max_update_time); void lightIdleUpdate(); bool addVisibleGroup(LLViewerOctreeGroup* group); - void addVisibleCacheEntry(LLVOCacheEntry* entry); + void addVisibleChildCacheEntry(LLVOCacheEntry* parent, LLVOCacheEntry* child); void addActiveCacheEntry(LLVOCacheEntry* entry); void removeActiveCacheEntry(LLVOCacheEntry* entry, LLDrawable* drawablep); void killCacheEntry(U32 local_id); //physically delete the cache entry |