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/llvocache.cpp | |
| parent | efb2f156b601d7ca0e2513552dd8a21c2d0ed3ff (diff) | |
| parent | 15fe4b3bbaf139960f934b629c236092182ed297 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llvocache.cpp')
| -rwxr-xr-x | indra/newview/llvocache.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp index 6e0243e985..d1c27edce7 100755 --- a/indra/newview/llvocache.cpp +++ b/indra/newview/llvocache.cpp @@ -219,15 +219,21 @@ void LLVOCacheEntry::setState(U32 state) if(getState() == ACTIVE) { - const S32 MIN_REAVTIVE_INTERVAL = 128; + const S32 MIN_INTERVAL = 64 + mMinFrameRange; U32 last_visible = getVisible(); setVisible(); - if(getVisible() - last_visible > MIN_REAVTIVE_INTERVAL + mMinFrameRange) + U32 cur_visible = getVisible(); + if(cur_visible - last_visible > MIN_INTERVAL || + cur_visible < MIN_INTERVAL) { mLastCameraUpdated = 0; //reset } + else + { + mLastCameraUpdated = LLViewerRegion::sLastCameraUpdated; + } } } |