From a9dd57c3517eb0ba1070f638d1eb6a4a56d4bfb7 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 7 Feb 2019 13:06:16 +0200
Subject: SL-10456 FIXED [EEP] Viewer continues to show last EEP environment
 after teleporting from EEP to non-EEP region

---
 indra/newview/llenvironment.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra')

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);
                 };
             }
-- 
cgit v1.2.3