diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-11-15 14:32:18 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-11-15 14:32:18 -0800 |
| commit | ba1fbddc2dbc526ee89e7d79b35cf3e0a46e3add (patch) | |
| tree | d779020d73e73a8eb9fa8731c362b8708c8837ef /indra/newview/llagent.cpp | |
| parent | 2783783575a9b712eb318b450dc5e6bb17d7f7c5 (diff) | |
| parent | a0a1d93fb6a74149bbef57f1d1489510247110ca (diff) | |
Merge 6ish
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 { |