From fcf25b690f94aff846a846fd52eeb778e8507f25 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 1 Feb 2019 18:33:55 +0200
Subject: SL-10364 FIXED Parcel Sky Altitudes not set correct when opening
 About Land -> Environment for the first time upon region arrival

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

(limited to 'indra/newview/llenvironment.cpp')

diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index a397f0f27a..bf8cf4b552 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -846,6 +846,17 @@ bool LLEnvironment::isInventoryEnabled() const
 void LLEnvironment::onRegionChange()
 {
     clearExperienceEnvironment(LLUUID::null, TRANSITION_DEFAULT);
+
+    LLViewerRegion* cur_region = gAgent.getRegion();
+    if (!cur_region)
+    {
+        return;
+    }
+    if (!cur_region->capabilitiesReceived())
+    {
+        cur_region->setCapabilitiesReceivedCallback([](LLUUID region_id) {  LLEnvironment::instance().requestRegion(); });
+        return;
+    }
     requestRegion();
 }
 
-- 
cgit v1.2.3