diff options
| author | Jonathan Yap <jhwelch@gmail.com> | 2015-01-07 18:47:18 -0500 |
|---|---|---|
| committer | Jonathan Yap <jhwelch@gmail.com> | 2015-01-07 18:47:18 -0500 |
| commit | 32ced419feb71d62f290872f98fc3d2bb4300c59 (patch) | |
| tree | 229980168778d6a6dbe995781d6ad500d8f3c013 /indra/newview/llviewerregion.cpp | |
| parent | 6de394342d2a3bd15ab8889e04619591a09fd6c6 (diff) | |
| parent | fe627f64742cbec698df0a907cb8aaea297df599 (diff) | |
STORM-2082 Merge
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rwxr-xr-x | 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 11cbf3fc24..31493ca6ce 100755 --- 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)); } |