Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A

# Conflicts:
#	indra/llappearance/llavatarappearance.h
#	indra/llimage/llimage.cpp
#	indra/llmath/llvolume.cpp
#	indra/llmath/llvolume.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llrendertarget.cpp
#	indra/llrender/llshadermgr.cpp
#	indra/newview/lldynamictexture.cpp
#	indra/newview/llenvironment.cpp
#	indra/newview/llfetchedgltfmaterial.cpp
#	indra/newview/llfloaterimagepreview.cpp
#	indra/newview/llfloaterimagepreview.h
#	indra/newview/llfloaterregioninfo.cpp
#	indra/newview/llfloaterregioninfo.h
#	indra/newview/llmaniprotate.cpp
#	indra/newview/llmaniptranslate.cpp
#	indra/newview/llpanelvolume.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/llselectmgr.h
#	indra/newview/llsurface.cpp
#	indra/newview/llsurface.h
#	indra/newview/llsurfacepatch.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/lltinygltfhelper.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llviewerwindow.h
#	indra/newview/llvlcomposition.cpp
#	indra/newview/llvlcomposition.h
#	indra/newview/llvocache.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/pipeline.cpp

1 files changed, 112 insertions, 15 deletions

diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 57d96f4f1b..f1644c51b4 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -791,8 +791,9 @@ void LLViewerRegion::loadObjectCache()
     if(LLVOCache::instanceExists())
     {
         LLVOCache & vocache = LLVOCache::instance();
-        vocache.readFromCache(mHandle, mImpl->mCacheID, mImpl->mCacheMap);
-        vocache.readGenericExtrasFromCache(mHandle, mImpl->mCacheID, mImpl->mGLTFOverridesLLSD);
+        // Without this a "corrupted" vocache persists until a cache clear or other rewrite. Mark as dirty hereif read fails to force a rewrite.
+        mCacheDirty = !vocache.readFromCache(mHandle, mImpl->mCacheID, mImpl->mCacheMap);
+        vocache.readGenericExtrasFromCache(mHandle, mImpl->mCacheID, mImpl->mGLTFOverridesLLSD, mImpl->mCacheMap);
 
         if (mImpl->mCacheMap.empty())
         {
@@ -1105,6 +1106,11 @@ void LLViewerRegion::dirtyHeights()
     }
 }
 
+void LLViewerRegion::dirtyAllPatches()
+{
+    getLand().dirtyAllPatches();
+}
+
 //physically delete the cache entry
 void LLViewerRegion::killCacheEntry(LLVOCacheEntry* entry, bool for_rendering)
 {
@@ -1155,13 +1161,13 @@ void LLViewerRegion::killCacheEntry(LLVOCacheEntry* entry, bool for_rendering)
             child = entry->getChild();
         }
     }
-
+    // Kill the assocaited overrides
+    mImpl->mGLTFOverridesLLSD.erase(entry->getLocalID());
     //will remove it from the object cache, real deletion
     entry->setState(LLVOCacheEntry::INACTIVE);
     entry->removeOctreeEntry();
     entry->setValid(false);
 
-    // TODO kill extras/material overrides cache too
 }
 
 //physically delete the cache entry
@@ -1605,7 +1611,19 @@ void LLViewerRegion::idleUpdate(F32 max_update_time)
 
     mLastUpdate = LLViewerOctreeEntryData::getCurrentFrame();
 
-    mImpl->mLandp->idleUpdate(max_update_time);
+    static LLCachedControl<bool> pbr_terrain_enabled(gSavedSettings, "RenderTerrainPBREnabled", false);
+    static LLCachedControl<bool> pbr_terrain_experimental_normals(gSavedSettings, "RenderTerrainPBRNormalsEnabled", false);
+    bool pbr_material = mImpl->mCompositionp && (mImpl->mCompositionp->getMaterialType() == LLTerrainMaterials::Type::PBR);
+    bool pbr_land = pbr_material && pbr_terrain_enabled && pbr_terrain_experimental_normals;
+
+    if (!pbr_land)
+    {
+        mImpl->mLandp->idleUpdate</*PBR=*/false>(max_update_time);
+    }
+    else
+    {
+        mImpl->mLandp->idleUpdate</*PBR=*/true>(max_update_time);
+    }
 
     if (mParcelOverlay)
     {
@@ -1905,7 +1923,21 @@ LLViewerObject* LLViewerRegion::updateCacheEntry(U32 local_id, LLViewerObject* o
 // As above, but forcibly do the update.
 void LLViewerRegion::forceUpdate()
 {
-    mImpl->mLandp->idleUpdate(0.f);
+    constexpr F32 max_update_time = 0.f;
+
+    static LLCachedControl<bool> pbr_terrain_enabled(gSavedSettings, "RenderTerrainPBREnabled", false);
+    static LLCachedControl<bool> pbr_terrain_experimental_normals(gSavedSettings, "RenderTerrainPBRNormalsEnabled", false);
+    bool pbr_material = mImpl->mCompositionp && (mImpl->mCompositionp->getMaterialType() == LLTerrainMaterials::Type::PBR);
+    bool pbr_land = pbr_material && pbr_terrain_enabled && pbr_terrain_experimental_normals;
+
+    if (!pbr_land)
+    {
+        mImpl->mLandp->idleUpdate</*PBR=*/false>(max_update_time);
+    }
+    else
+    {
+        mImpl->mLandp->idleUpdate</*PBR=*/true>(max_update_time);
+    }
 
     if (mParcelOverlay)
     {
@@ -2407,6 +2439,54 @@ void LLViewerRegion::setSimulatorFeatures(const LLSD& sim_features)
 
     setSimulatorFeaturesReceived(true);
 
+    // WARNING: this is called from a coroutine, and flipping saved settings has a LOT of side effects, shuttle
+    // the work below back to the main loop
+    //
+
+    // copy features to lambda in case the region is deleted before the lambda is executed
+    LLSD features = mSimulatorFeatures;
+
+    auto work = [=]()
+        {
+            // if region has MaxTextureResolution, set max_texture_dimension settings, otherwise use default
+            if (features.has("MaxTextureResolution"))
+            {
+                S32 max_texture_resolution = features["MaxTextureResolution"].asInteger();
+                gSavedSettings.setS32("max_texture_dimension_X", max_texture_resolution);
+                gSavedSettings.setS32("max_texture_dimension_Y", max_texture_resolution);
+            }
+            else
+            {
+                gSavedSettings.setS32("max_texture_dimension_X", 1024);
+                gSavedSettings.setS32("max_texture_dimension_Y", 1024);
+            }
+
+            if (features.has("PBRTerrainEnabled"))
+            {
+                bool enabled = features["PBRTerrainEnabled"];
+                gSavedSettings.setBOOL("RenderTerrainPBREnabled", enabled);
+            }
+            else
+            {
+                gSavedSettings.setBOOL("RenderTerrainPBREnabled", false);
+            }
+
+            if (features.has("PBRMaterialSwatchEnabled"))
+            {
+                bool enabled = features["PBRMaterialSwatchEnabled"];
+                gSavedSettings.setBOOL("UIPreviewMaterial", enabled);
+            }
+            else
+            {
+                gSavedSettings.setBOOL("UIPreviewMaterial", false);
+            }
+        };
+
+    auto workqueue = LL::WorkQueue::getInstance("mainloop");
+    if (workqueue)
+    {
+        LL::WorkQueue::postMaybe(workqueue, work);
+    }
 }
 
 //this is called when the parent is not cacheable.
@@ -2663,7 +2743,14 @@ LLViewerRegion::eCacheUpdateResult LLViewerRegion::cacheFullUpdate(LLViewerObjec
 void LLViewerRegion::cacheFullUpdateGLTFOverride(const LLGLTFOverrideCacheEntry &override_data)
 {
     U32 local_id = override_data.mLocalId;
-    mImpl->mGLTFOverridesLLSD[local_id] = override_data;
+    if (override_data.mSides.size() > 0)
+    { // empty override means overrides were removed from this object
+        mImpl->mGLTFOverridesLLSD[local_id] = override_data;
+    }
+    else
+    {
+        mImpl->mGLTFOverridesLLSD.erase(local_id);
+    }
 }
 
 LLVOCacheEntry* LLViewerRegion::getCacheEntryForOctree(U32 local_id)
@@ -2880,6 +2967,11 @@ void LLViewerRegion::dumpCache()
     // TODO - add overrides cache too
 }
 
+void LLViewerRegion::clearVOCacheFromMemory()
+{
+    mImpl->mCacheMap.clear();
+}
+
 void LLViewerRegion::unpackRegionHandshake()
 {
     LLMessageSystem *msg = gMessageSystem;
@@ -2964,20 +3056,20 @@ void LLViewerRegion::unpackRegionHandshake()
 
         // Get the 4 textures for land
         msg->getUUID("RegionInfo", "TerrainDetail0", tmp_id);
-        changed |= (tmp_id != compp->getDetailTextureID(0));
-        compp->setDetailTextureID(0, tmp_id);
+        changed |= (tmp_id != compp->getDetailAssetID(0));
+        compp->setDetailAssetID(0, tmp_id);
 
         msg->getUUID("RegionInfo", "TerrainDetail1", tmp_id);
-        changed |= (tmp_id != compp->getDetailTextureID(1));
-        compp->setDetailTextureID(1, tmp_id);
+        changed |= (tmp_id != compp->getDetailAssetID(1));
+        compp->setDetailAssetID(1, tmp_id);
 
         msg->getUUID("RegionInfo", "TerrainDetail2", tmp_id);
-        changed |= (tmp_id != compp->getDetailTextureID(2));
-        compp->setDetailTextureID(2, tmp_id);
+        changed |= (tmp_id != compp->getDetailAssetID(2));
+        compp->setDetailAssetID(2, tmp_id);
 
         msg->getUUID("RegionInfo", "TerrainDetail3", tmp_id);
-        changed |= (tmp_id != compp->getDetailTextureID(3));
-        compp->setDetailTextureID(3, tmp_id);
+        changed |= (tmp_id != compp->getDetailAssetID(3));
+        compp->setDetailAssetID(3, tmp_id);
 
         // Get the start altitude and range values for land textures
         F32 tmp_f32;
@@ -3663,6 +3755,11 @@ void LLViewerRegion::applyCacheMiscExtras(LLViewerObject* obj)
     auto iter = mImpl->mGLTFOverridesLLSD.find(local_id);
     if (iter != mImpl->mGLTFOverridesLLSD.end())
     {
+        // UUID can be inserted null, so backfill the UUID if it was left empty
+        if (iter->second.mObjectId.isNull())
+        {
+            iter->second.mObjectId = obj->getID();
+        }
         llassert(iter->second.mGLTFMaterial.size() == iter->second.mSides.size());
 
         for (auto& side : iter->second.mGLTFMaterial)