diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-07-30 22:15:49 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-07-30 22:15:49 -0600 |
| commit | b832e6b62d96d30711f4eee2d299e257617692c8 (patch) | |
| tree | 0d58682a8218fce416b08d7f997c80d1bc09b825 /indra/newview/llviewerregion.h | |
| parent | efb2f156b601d7ca0e2513552dd8a21c2d0ed3ff (diff) | |
| parent | 15fe4b3bbaf139960f934b629c236092182ed297 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llviewerregion.h')
| -rwxr-xr-x | indra/newview/llviewerregion.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index 24d3dfae92..a8e0b7bba9 100755 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -369,8 +369,8 @@ private: void replaceVisibleCacheEntry(LLVOCacheEntry* old_entry, LLVOCacheEntry* new_entry); void killCacheEntry(LLVOCacheEntry* entry); //physically delete the cache entry - F32 killInvisibleObjects(F32 max_time); - F32 createVisibleObjects(F32 max_time); + F32 killInvisibleObjects(F32 max_time, S32 throttle); + F32 createVisibleObjects(F32 max_time, S32 throttle); F32 updateVisibleEntries(F32 max_time); //update visible entries void addCacheMiss(U32 id, LLViewerRegion::eCacheMissType miss_type); |