diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-03-29 22:27:54 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-03-29 22:27:54 -0600 |
| commit | 1c9bb66ba347f93f964c8a1477f23675d529d970 (patch) | |
| tree | 2e6f3e581679706fe10138b2cc14424e673c7e27 /indra/newview/llvocache.h | |
| parent | cd46f3d08cef6f43c29447e36c920d10ec184a18 (diff) | |
| parent | da02b9f69471baa407188e2921b5c56c9b8d9415 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llvocache.h')
| -rw-r--r-- | indra/newview/llvocache.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvocache.h b/indra/newview/llvocache.h index c26bebb451..5f2dd63051 100644 --- a/indra/newview/llvocache.h +++ b/indra/newview/llvocache.h @@ -202,7 +202,7 @@ public: void removeCache(ELLPath location, bool started = false) ; void readFromCache(U64 handle, const LLUUID& id, LLVOCacheEntry::vocache_entry_map_t& cache_entry_map) ; - void writeToCache(U64 handle, const LLUUID& id, const LLVOCacheEntry::vocache_entry_map_t& cache_entry_map, BOOL dirty_cache, BOOL full_region_cache_probe); + void writeToCache(U64 handle, const LLUUID& id, const LLVOCacheEntry::vocache_entry_map_t& cache_entry_map, BOOL dirty_cache, bool removal_enabled); void removeEntry(U64 handle) ; void setReadOnly(BOOL read_only) {mReadOnly = read_only;} |