1 files changed, 35 insertions, 5 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index f1644c51b4..c75d590df8 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -55,6 +55,7 @@
 #include "llfloaterregioninfo.h"
 #include "llgltfmateriallist.h"
 #include "llhttpnode.h"
+#include "llpbrterrainfeatures.h"
 #include "llregioninfomodel.h"
 #include "llsdutil.h"
 #include "llstartup.h"
@@ -2480,13 +2481,30 @@ void LLViewerRegion::setSimulatorFeatures(const LLSD& sim_features)
             {
                 gSavedSettings.setBOOL("UIPreviewMaterial", false);
             }
+
+            if (features.has("GLTFEnabled"))
+            {
+                bool enabled = features["GLTFEnabled"];
+                gSavedSettings.setBOOL("GLTFEnabled", enabled);
+            }
+            else
+            {
+                gSavedSettings.setBOOL("GLTFEnabled", false);
+            }
+
+            if (features.has("PBRTerrainTransformsEnabled"))
+            {
+                bool enabled = features["PBRTerrainTransformsEnabled"];
+                gSavedSettings.setBOOL("RenderTerrainTransformsPBREnabled", enabled);
+            }
+            else
+            {
+                gSavedSettings.setBOOL("RenderTerrainTransformsPBREnabled", false);
+            }
         };
 
-    auto workqueue = LL::WorkQueue::getInstance("mainloop");
-    if (workqueue)
-    {
-        LL::WorkQueue::postMaybe(workqueue, work);
-    }
+
+    LLAppViewer::instance()->postToMainCoro(work);
 }
 
 //this is called when the parent is not cacheable.
@@ -3120,6 +3138,17 @@ void LLViewerRegion::unpackRegionHandshake()
         {
             compp->setParamsReady();
         }
+
+        LLPBRTerrainFeatures::queueQuery(*this, [](LLUUID region_id, bool success, const LLModifyRegion& composition_changes)
+        {
+            if (!success) { return; }
+            LLViewerRegion* region = LLWorld::getInstance()->getRegionFromID(region_id);
+            if (!region) { return; }
+            LLVLComposition* compp = region->getComposition();
+            if (!compp) { return; }
+            compp->apply(composition_changes);
+            LLFloaterRegionInfo::sRefreshFromRegion(region);
+        });
     }
 
 
@@ -3217,6 +3246,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
     capabilityNames.append("MapLayerGod");
     capabilityNames.append("MeshUploadFlag");
     capabilityNames.append("ModifyMaterialParams");
+    capabilityNames.append("ModifyRegion");
     capabilityNames.append("NavMeshGenerationStatus");
     capabilityNames.append("NewFileAgentInventory");
     capabilityNames.append("ObjectAnimation");