diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-03-07 12:41:11 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-03-07 12:41:11 -0500 |
| commit | 5822fb00b605d4f4ddd01e887b40d04b67e162a9 (patch) | |
| tree | 0aa733a2357c99383f18ed34d2fb2ad4ad0caa24 /indra/newview/llviewerregion.cpp | |
| parent | c7ebeb842010c4a814978f63c464e1546bd6a9be (diff) | |
| parent | 346ee6595d395a92a1445441467971510e6f4b6d (diff) | |
merge DRTVWR-398 build cleanup fixes
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 6af3e40f01..9771756266 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -475,8 +475,7 @@ LLViewerRegion::LLViewerRegion(const U64 &handle, mImpl->mObjectPartition.push_back(NULL); //PARTITION_NONE mImpl->mVOCachePartition = getVOCachePartition(); - mRenderInfoRequestTimer.resetWithExpiry(0.f); // Set timer to be expired - setCapabilitiesReceivedCallback(boost::bind(&LLAvatarRenderInfoAccountant::expireRenderInfoReportTimer, _1)); + setCapabilitiesReceivedCallback(boost::bind(&LLAvatarRenderInfoAccountant::scanNewRegion, _1)); } |