summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2019-02-07 13:06:16 +0200
committermaxim_productengine <mnikolenko@productengine.com>2019-02-07 13:06:16 +0200
commita9dd57c3517eb0ba1070f638d1eb6a4a56d4bfb7 (patch)
tree4dbd9ef77c737a067ea3310658b8678f29c62e0d /indra
parent95e9b9d2d284c50b1f31b86d012b22a06ebd5e34 (diff)
SL-10456 FIXED [EEP] Viewer continues to show last EEP environment after teleporting from EEP to non-EEP region
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llenvironment.cpp1
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);
};
}