diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-07-29 10:15:10 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-07-29 10:15:10 -0600 |
| commit | 4cca9ba279f908f206fa5e32adccf1038f05cc7f (patch) | |
| tree | 9e50666f9c0c5e6340247ac3f7f627c1deef2b1b /indra/newview/llviewerregion.cpp | |
| parent | a9593367984f4411eedf8ee93178e24936ae1acb (diff) | |
fix for SH-4293: texture console takes a while to settle down on Interesting viewer.
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rwxr-xr-x | indra/newview/llviewerregion.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index b80d87ef07..cd8466d948 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -87,6 +87,7 @@ const F32 CAP_REQUEST_TIMEOUT = 18; const S32 MAX_CAP_REQUEST_ATTEMPTS = 30; BOOL LLViewerRegion::sVOCacheCullingEnabled = FALSE; +S32 LLViewerRegion::sLastCameraUpdated = 0; typedef std::map<std::string, std::string> CapabilityMap; @@ -992,6 +993,7 @@ void LLViewerRegion::removeFromVOCacheTree(LLVOCacheEntry* entry) } mImpl->mVOCachePartition->removeEntry(entry->getEntry()); + entry->mLastCameraUpdated = sLastCameraUpdated; } //add the visible entries @@ -1219,7 +1221,7 @@ F32 LLViewerRegion::killInvisibleObjects(F32 max_time) iter = mImpl->mActiveSet.begin(); } - if(!(*iter)->isRecentlyVisible()) + if(!(*iter)->isRecentlyVisible() && (*iter)->mLastCameraUpdated != sLastCameraUpdated) { killObject((*iter), delete_list); } |