diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-02-08 12:44:29 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-02-08 12:44:29 -0800 |
| commit | 5c5b625892a86dfa467225c059f7ef1188ba46ca (patch) | |
| tree | 65773de98719a3e7e85f9ba4a76371f3a90ce444 /indra/newview/llenvironment.cpp | |
| parent | 9f2a0d2a082495ce878f0eb0d7348b181939d348 (diff) | |
| parent | c909e496fd1a0710e5349441ef4e3cae5ff98de6 (diff) | |
Merge SL-10501 fix
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 fa583bdc9c..9179c545df 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -1595,6 +1595,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); }; } |