diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-11-14 22:47:31 +0200 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-11-14 22:47:31 +0200 |
commit | c21396181b090b626d7a9f989bcead2e517bb75f (patch) | |
tree | c543941ee817a5b5952ff670d8ae03cd4663bd88 /indra/newview/llagent.cpp | |
parent | 62085f9f7904aa20406aa4f0122065aec3a786ee (diff) | |
parent | 8558ce5c600b810356010ba3cd6d534ef22f4081 (diff) |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llagent.cpp')
-rw-r--r-- | indra/newview/llagent.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 9b8cc62aa8..ba250fa471 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -881,6 +881,16 @@ void LLAgent::setRegion(LLViewerRegion *regionp) { gSky.mVOGroundp->setRegion(regionp); } + + if (regionp->capabilitiesReceived()) + { + regionp->requestSimulatorFeatures(); + } + else + { + regionp->setCapabilitiesReceivedCallback(boost::bind(&LLViewerRegion::requestSimulatorFeatures, regionp)); + } + } else { |