diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-06-08 20:01:38 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-06-08 20:01:38 +0300 |
| commit | 1a024f04cd721ad27836927af6616bf44e611017 (patch) | |
| tree | c9a0d3187aebc998f06f01ce4af4b71614146115 | |
| parent | d98df5ec2b7d3bb25f1f1fcb60cee50049ee0bb8 (diff) | |
| parent | 0a36c8d3be17032db20a9bdeff2b00ae2ed608a0 (diff) | |
Merged in lindenlab/viewer-bear
| -rw-r--r-- | indra/newview/llavatarrenderinfoaccountant.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llavatarrenderinfoaccountant.cpp b/indra/newview/llavatarrenderinfoaccountant.cpp index 7413dbed20..7c7f55f68c 100644 --- a/indra/newview/llavatarrenderinfoaccountant.cpp +++ b/indra/newview/llavatarrenderinfoaccountant.cpp @@ -286,6 +286,9 @@ void LLAvatarRenderInfoAccountant::sendRenderInfoToRegion(LLViewerRegion * regio && regionp->getRenderInfoReportTimer().hasExpired() // Time to make request) ) { + // make sure we won't re-report, coro will update timer with correct time later + regionp->getRenderInfoReportTimer().resetWithExpiry(SECS_BETWEEN_REGION_REPORTS); + std::string coroname = LLCoros::instance().launch("LLAvatarRenderInfoAccountant::avatarRenderInfoReportCoro", boost::bind(&LLAvatarRenderInfoAccountant::avatarRenderInfoReportCoro, url, regionp->getHandle())); @@ -306,6 +309,9 @@ void LLAvatarRenderInfoAccountant::getRenderInfoFromRegion(LLViewerRegion * regi << " from " << url << LL_ENDL; + // make sure we won't re-request, coro will update timer with correct time later + regionp->getRenderInfoRequestTimer().resetWithExpiry(SECS_BETWEEN_REGION_REQUEST); + // First send a request to get the latest data std::string coroname = LLCoros::instance().launch("LLAvatarRenderInfoAccountant::avatarRenderInfoGetCoro", |