1 files changed, 11 insertions, 0 deletions
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();
 }