diff options
author | Dave Houlton <euclid@lindenlab.com> | 2021-07-19 15:55:57 -0600 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2021-07-19 15:55:57 -0600 |
commit | 4c849ba91363f82da05cce1221b04075a6ca72af (patch) | |
tree | 33edfb0495161594a50dcfbed3a3f42e7fde9143 /indra/newview/llwlhandlers.cpp | |
parent | dc14dbf54d332a6cdc43002bb71ed71e9a473647 (diff) | |
parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) |
Merge branch 'master' v 6.4.22 into DRTVWR-528
Diffstat (limited to 'indra/newview/llwlhandlers.cpp')
-rw-r--r-- | indra/newview/llwlhandlers.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llwlhandlers.cpp b/indra/newview/llwlhandlers.cpp index 730aa3774f..d55e1b7cd3 100644 --- a/indra/newview/llwlhandlers.cpp +++ b/indra/newview/llwlhandlers.cpp @@ -51,7 +51,7 @@ bool LLEnvironmentRequest::initiate(LLEnvironment::environment_apply_fn cb) if (!cur_region->capabilitiesReceived()) { LL_INFOS("WindlightCaps") << "Deferring windlight settings request until we've got region caps" << LL_ENDL; - cur_region->setCapabilitiesReceivedCallback([cb](const LLUUID ®ion_id) { LLEnvironmentRequest::onRegionCapsReceived(region_id, cb); }); + cur_region->setCapabilitiesReceivedCallback([cb](const LLUUID ®ion_id, LLViewerRegion* regionp) { LLEnvironmentRequest::onRegionCapsReceived(region_id, cb); }); return false; } |