diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-11-14 23:03:31 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-11-14 23:03:31 +0200 |
| commit | 8cac4f7b135a126c096b4eb96e618aeccad1b030 (patch) | |
| tree | 636957925b67cad4bb3c7e7f7af382492b3e0452 /indra/newview/llagent.cpp | |
| parent | 31be136d4056e02cbf5c377f3544235debb7376b (diff) | |
| parent | 9839a68c5a0ceba42cbe2745b4c7ef279e32813f (diff) | |
Merged in lindenlab/viewer-lynx
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 { |