diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-02-11 16:51:06 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-02-11 16:51:06 -0800 |
| commit | d5aba3988291a2929f4b894d91250e75ffde3d8e (patch) | |
| tree | d6360cee0c52097840412c978e039bfd69eced70 /indra/newview/llenvironment.cpp | |
| parent | 2a740309d01ca2ab80fd054ea8d8a79fb7ebbbe0 (diff) | |
| parent | 5433ed60ac93c6ccc7692ad43d579a83ab544f31 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llenvironment.cpp')
| -rw-r--r-- | indra/newview/llenvironment.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index 2dede1a667..1018075409 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -1675,6 +1675,7 @@ void LLEnvironment::requestParcel(S32 parcel_id, environment_apply_fn cb) LLSettingsBase::Seconds transition = LLViewerParcelMgr::getInstance()->getTeleportInProgress() ? TRANSITION_FAST : TRANSITION_DEFAULT; cb = [this, transition](S32 pid, EnvironmentInfo::ptr_t envinfo) { + clearEnvironment(ENV_PARCEL); recordEnvironment(pid, envinfo, transition); }; } |