Merge remote-tracking branch 'origin/release/2024.12-ForeverFPS' into develop (#3352)

brad-linden · brad-linden · commit 5f6dce201265 · 2025-01-06T15:08:06.000-08:00
# Conflicts:
 #	indra/newview/pipeline.cpp
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
@@ -2032,43 +2032,43 @@ F32 LLSettingsSky::getGamma() const
     return mGamma;
 }
 
-F32 LLSettingsSky::getHDRMin() const
+F32 LLSettingsSky::getHDRMin(bool auto_adjust) const
 {
-    if (mCanAutoAdjust)
+    if (mCanAutoAdjust && !auto_adjust)
         return 0.f;
 
     return mHDRMin;
 }
 
-F32 LLSettingsSky::getHDRMax() const
+F32 LLSettingsSky::getHDRMax(bool auto_adjust) const
 {
-    if (mCanAutoAdjust)
+    if (mCanAutoAdjust && !auto_adjust)
         return 0.f;
 
     return mHDRMax;
 }
 
-F32 LLSettingsSky::getHDROffset() const
+F32 LLSettingsSky::getHDROffset(bool auto_adjust) const
 {
-    if (mCanAutoAdjust)
+    if (mCanAutoAdjust && !auto_adjust)
         return 1.0f;
 
     return mHDROffset;
 }
 
-F32 LLSettingsSky::getTonemapMix() const
+F32 LLSettingsSky::getTonemapMix(bool auto_adjust) const
 {
-    if (mCanAutoAdjust)
+    if (mCanAutoAdjust && !auto_adjust)
+    {
+        // legacy settings do not support tonemaping
         return 0.0f;
+    }
 
     return mTonemapMix;
 }
 
 void LLSettingsSky::setTonemapMix(F32 mix)
 {
-    if (mCanAutoAdjust)
-        return;
-
     mTonemapMix = mix;
 }
 
diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h
@@ -209,10 +209,10 @@ class LLSettingsSky: public LLSettingsBase
 
     F32 getGamma() const;
 
-    F32 getHDRMin() const;
-    F32 getHDRMax() const;
-    F32 getHDROffset() const;
-    F32 getTonemapMix() const;
+    F32 getHDRMin(bool auto_adjust = false) const;
+    F32 getHDRMax(bool auto_adjust = false) const;
+    F32 getHDROffset(bool auto_adjust = false) const;
+    F32 getTonemapMix(bool auto_adjust = false) const;
     void setTonemapMix(F32 mix);
 
     void setGamma(F32 val);
diff --git a/indra/llui/llfolderview.h b/indra/llui/llfolderview.h
@@ -414,6 +414,7 @@ class LLSaveFolderState : public LLFolderViewFunctor
     virtual void doItem(LLFolderViewItem* item) {}
     void setApply(bool apply);
     void clearOpenFolders() { mOpenFolders.clear(); }
+    bool hasOpenFolders() { return !mOpenFolders.empty(); }
 protected:
     std::set<LLUUID> mOpenFolders;
     bool mApply;
diff --git a/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl b/indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl
@@ -38,6 +38,8 @@ uniform float max_probe_lod;
 
 uniform bool transparent_surface;
 
+uniform int classic_mode;
+
 #define MAX_REFMAP_COUNT 256  // must match LL_MAX_REFLECTION_PROBE_COUNT
 
 layout (std140) uniform ReflectionProbes
@@ -739,7 +741,10 @@ void doProbeSample(inout vec3 ambenv, inout vec3 glossenv,
 
     vec3 refnormpersp = reflect(pos.xyz, norm.xyz);
 
-    ambenv = sampleProbeAmbient(pos, norm, amblit);
+    ambenv = amblit;
+
+    if (classic_mode == 0)
+        ambenv = sampleProbeAmbient(pos, norm, amblit);
 
     float lod = (1.0-glossiness)*reflection_lods;
     glossenv = sampleProbes(pos, normalize(refnormpersp), lod);
@@ -845,7 +850,10 @@ void sampleReflectionProbesLegacy(out vec3 ambenv, out vec3 glossenv, out vec3 l
 
     vec3 refnormpersp = reflect(pos.xyz, norm.xyz);
 
-    ambenv = sampleProbeAmbient(pos, norm, amblit);
+    ambenv = amblit;
+
+    if (classic_mode == 0)
+        ambenv = sampleProbeAmbient(pos, norm, amblit);
 
     if (glossiness > 0.0)
     {
diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp
@@ -139,32 +139,60 @@ void LLPanelContents::getState(LLViewerObject *objectp )
 void LLPanelContents::onFilterEdit()
 {
     const std::string& filter_substring = mFilterEditor->getText();
-    if (filter_substring.empty())
+    if (!mPanelInventoryObject->hasInventory())
     {
-        if (mPanelInventoryObject->getFilter().getFilterSubString().empty())
-        {
-            // The current filter and the new filter are empty, nothing to do
-            return;
-        }
-
-        mSavedFolderState.setApply(true);
-        mPanelInventoryObject->getRootFolder()->applyFunctorRecursively(mSavedFolderState);
-
-        // Add a folder with the current item to the list of previously opened folders
-        LLOpenFoldersWithSelection opener;
-        mPanelInventoryObject->getRootFolder()->applyFunctorRecursively(opener);
-        mPanelInventoryObject->getRootFolder()->scrollToShowSelection();
+        mDirtyFilter = true;
     }
-    else if (mPanelInventoryObject->getFilter().getFilterSubString().empty())
+    else
     {
-        // The first letter in search term, save existing folder open state
-        if (!mPanelInventoryObject->getFilter().isNotDefault())
+        LLFolderView* root_folder = mPanelInventoryObject->getRootFolder();
+        if (filter_substring.empty())
         {
-            mSavedFolderState.setApply(false);
-            mPanelInventoryObject->getRootFolder()->applyFunctorRecursively(mSavedFolderState);
+            if (mPanelInventoryObject->getFilter().getFilterSubString().empty())
+            {
+                // The current filter and the new filter are empty, nothing to do
+                return;
+            }
+
+            if (mDirtyFilter && !mSavedFolderState.hasOpenFolders())
+            {
+                if (root_folder)
+                {
+                    root_folder->setOpenArrangeRecursively(true, LLFolderViewFolder::ERecurseType::RECURSE_DOWN);
+                }
+            }
+            else
+            {
+                mSavedFolderState.setApply(true);
+                if (root_folder)
+                {
+                    root_folder->applyFunctorRecursively(mSavedFolderState);
+                }
+            }
+            mDirtyFilter = false;
+
+            // Add a folder with the current item to the list of previously opened folders
+            if (root_folder)
+            {
+                LLOpenFoldersWithSelection opener;
+                root_folder->applyFunctorRecursively(opener);
+                root_folder->scrollToShowSelection();
+            }
+        }
+        else if (mPanelInventoryObject->getFilter().getFilterSubString().empty())
+        {
+            // The first letter in search term, save existing folder open state
+            if (!mPanelInventoryObject->getFilter().isNotDefault())
+            {
+                mSavedFolderState.setApply(false);
+                if (root_folder)
+                {
+                    root_folder->applyFunctorRecursively(mSavedFolderState);
+                }
+                mDirtyFilter = false;
+            }
         }
     }
-
     mPanelInventoryObject->getFilter().setFilterSubString(filter_substring);
 }
 
diff --git a/indra/newview/llpanelcontents.h b/indra/newview/llpanelcontents.h
@@ -70,6 +70,8 @@ class LLPanelContents : public LLPanel
     void getState(LLViewerObject *object);
     void onFilterEdit();
 
+    bool mDirtyFilter { false };
+
 public:
     class LLFilterEditor* mFilterEditor;
     LLSaveFolderState mSavedFolderState;
diff --git a/indra/newview/llpanelobjectinventory.h b/indra/newview/llpanelobjectinventory.h
@@ -85,6 +85,8 @@ class LLPanelObjectInventory : public LLPanel, public LLVOInventoryListener
 
     static void idle(void* user_data);
 
+    bool hasInventory(){ return mHaveInventory; };
+
 protected:
     void reset();
     /*virtual*/ void inventoryChanged(LLViewerObject* object,
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp
@@ -807,7 +807,7 @@ void LLSettingsVOSky::applySpecial(void *ptarget, bool force)
     static LLCachedControl<F32> tonemap_mix_setting(gSavedSettings, "RenderTonemapMix", 1.f);
 
     // sky is a "classic" sky following pre SL 7.0 shading
-    bool classic_mode = psky->canAutoAdjust();
+    bool classic_mode = psky->canAutoAdjust() && !should_auto_adjust();
 
     if (!classic_mode)
     {
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
@@ -1505,7 +1505,7 @@ bool idle_startup()
         // create a container's instance for start a controlling conversation windows
         // by the voice's events
         LLFloaterIMContainer *im_inst = LLFloaterIMContainer::getInstance();
-        if(gAgent.isFirstLogin())
+        if(gAgent.isFirstLogin() && im_inst)
         {
             im_inst->openFloater(im_inst->getKey());
         }
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
@@ -647,8 +647,12 @@ void LLVOVolume::animateTextures()
                         // LLVOVolume::updateTextureVirtualSize when the
                         // mTextureMatrix is not yet present
                         gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_TCOORD);
-                        mDrawable->getSpatialGroup()->dirtyGeom();
-                        gPipeline.markRebuild(mDrawable->getSpatialGroup());
+                        LLSpatialGroup* group = mDrawable->getSpatialGroup();
+                        if (group)
+                        {
+                            group->dirtyGeom();
+                            gPipeline.markRebuild(group);
+                        }
                     }
                 }
 
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
@@ -7068,7 +7068,7 @@ void LLPipeline::generateExposure(LLRenderTarget* src, LLRenderTarget* dst, bool
 
         LLSettingsSky::ptr_t sky = LLEnvironment::instance().getCurrentSky();
 
-        F32 probe_ambiance = LLEnvironment::instance().getCurrentSky()->getReflectionProbeAmbiance(should_auto_adjust);
+        F32 probe_ambiance = LLEnvironment::instance().getCurrentSky()->getReflectionProbeAmbiance(should_auto_adjust());
 
         F32 exp_min = 1.f;
         F32 exp_max = 1.f;
@@ -7079,13 +7079,13 @@ void LLPipeline::generateExposure(LLRenderTarget* src, LLRenderTarget* dst, bool
         {
             if (dynamic_exposure_enabled)
             {
-                exp_min = sky->getHDROffset() - sky->getHDRMin();
-                exp_max = sky->getHDROffset() + sky->getHDRMax();
+                exp_min = sky->getHDROffset(should_auto_adjust()) - sky->getHDRMin(should_auto_adjust());
+                exp_max = sky->getHDROffset(should_auto_adjust()) + sky->getHDRMax(should_auto_adjust());
             }
             else
             {
-                exp_min = sky->getHDROffset();
-                exp_max = sky->getHDROffset();
+                exp_min = sky->getHDROffset(should_auto_adjust());
+                exp_max = sky->getHDROffset(should_auto_adjust());
             }
         }
         else if (dynamic_exposure_enabled)
@@ -7105,7 +7105,7 @@ void LLPipeline::generateExposure(LLRenderTarget* src, LLRenderTarget* dst, bool
         shader->uniform1f(dt, gFrameIntervalSeconds);
         shader->uniform2f(noiseVec, ll_frand() * 2.0f - 1.0f, ll_frand() * 2.0f - 1.0f);
         shader->uniform4f(dynamic_exposure_params, dynamic_exposure_coefficient, exp_min, exp_max, dynamic_exposure_speed_error);
-        shader->uniform4f(dynamic_exposure_params2, sky->getHDROffset(), exp_min, exp_max, dynamic_exposure_speed_target);
+        shader->uniform4f(dynamic_exposure_params2, sky->getHDROffset(should_auto_adjust()), exp_min, exp_max, dynamic_exposure_speed_target);
 
         mScreenTriangleVB->setBuffer();
         mScreenTriangleVB->drawArrays(LLRender::TRIANGLES, 0, 3);
@@ -7172,7 +7172,7 @@ void LLPipeline::tonemap(LLRenderTarget* src, LLRenderTarget* dst, bool gamma_co
 
         static LLCachedControl<U32> tonemap_type_setting(gSavedSettings, "RenderTonemapType", 0U);
         shader->uniform1i(tonemap_type, tonemap_type_setting);
-        shader->uniform1f(tonemap_mix, psky->getTonemapMix());
+        shader->uniform1f(tonemap_mix, psky->getTonemapMix(should_auto_adjust()));
 
         mScreenTriangleVB->setBuffer();
         mScreenTriangleVB->drawArrays(LLRender::TRIANGLES, 0, 3);

Original file line number	Diff line number	Diff line change
`@@ -2032,43 +2032,43 @@ F32 LLSettingsSky::getGamma() const`
`2032`	`2032`	`return mGamma;`
`2033`	`2033`	`}`
`2034`	`2034`
`2035`		`-F32 LLSettingsSky::getHDRMin() const`
	`2035`	`+F32 LLSettingsSky::getHDRMin(bool auto_adjust) const`
`2036`	`2036`	`{`
`2037`		`- if (mCanAutoAdjust)`
	`2037`	`+ if (mCanAutoAdjust && !auto_adjust)`
`2038`	`2038`	`return 0.f;`
`2039`	`2039`
`2040`	`2040`	`return mHDRMin;`
`2041`	`2041`	`}`
`2042`	`2042`
`2043`		`-F32 LLSettingsSky::getHDRMax() const`
	`2043`	`+F32 LLSettingsSky::getHDRMax(bool auto_adjust) const`
`2044`	`2044`	`{`
`2045`		`- if (mCanAutoAdjust)`
	`2045`	`+ if (mCanAutoAdjust && !auto_adjust)`
`2046`	`2046`	`return 0.f;`
`2047`	`2047`
`2048`	`2048`	`return mHDRMax;`
`2049`	`2049`	`}`
`2050`	`2050`
`2051`		`-F32 LLSettingsSky::getHDROffset() const`
	`2051`	`+F32 LLSettingsSky::getHDROffset(bool auto_adjust) const`
`2052`	`2052`	`{`
`2053`		`- if (mCanAutoAdjust)`
	`2053`	`+ if (mCanAutoAdjust && !auto_adjust)`
`2054`	`2054`	`return 1.0f;`
`2055`	`2055`
`2056`	`2056`	`return mHDROffset;`
`2057`	`2057`	`}`
`2058`	`2058`
`2059`		`-F32 LLSettingsSky::getTonemapMix() const`
	`2059`	`+F32 LLSettingsSky::getTonemapMix(bool auto_adjust) const`
`2060`	`2060`	`{`
`2061`		`- if (mCanAutoAdjust)`
	`2061`	`+ if (mCanAutoAdjust && !auto_adjust)`
	`2062`	`+ {`
	`2063`	`+ // legacy settings do not support tonemaping`
`2062`	`2064`	`return 0.0f;`
	`2065`	`+ }`
`2063`	`2066`
`2064`	`2067`	`return mTonemapMix;`
`2065`	`2068`	`}`
`2066`	`2069`
`2067`	`2070`	`void LLSettingsSky::setTonemapMix(F32 mix)`
`2068`	`2071`	`{`
`2069`		`- if (mCanAutoAdjust)`
`2070`		`- return;`
`2071`		`-`
`2072`	`2072`	`mTonemapMix = mix;`
`2073`	`2073`	`}`
`2074`	`2074`
Original file line number	Diff line number	Diff line change
`@@ -807,7 +807,7 @@ void LLSettingsVOSky::applySpecial(void *ptarget, bool force)`
`807`	`807`	`static LLCachedControl<F32> tonemap_mix_setting(gSavedSettings, "RenderTonemapMix", 1.f);`
`808`	`808`
`809`	`809`	`// sky is a "classic" sky following pre SL 7.0 shading`
`810`		`- bool classic_mode = psky->canAutoAdjust();`
	`810`	`+ bool classic_mode = psky->canAutoAdjust() && !should_auto_adjust();`
`811`	`811`
`812`	`812`	`if (!classic_mode)`
`813`	`813`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1505,7 +1505,7 @@ bool idle_startup()`
`1505`	`1505`	`// create a container's instance for start a controlling conversation windows`
`1506`	`1506`	`// by the voice's events`
`1507`	`1507`	`LLFloaterIMContainer *im_inst = LLFloaterIMContainer::getInstance();`
`1508`		`- if(gAgent.isFirstLogin())`
	`1508`	`+ if(gAgent.isFirstLogin() && im_inst)`
`1509`	`1509`	`{`
`1510`	`1510`	`im_inst->openFloater(im_inst->getKey());`
`1511`	`1511`	`}`
Original file line number	Diff line number	Diff line change
`@@ -647,8 +647,12 @@ void LLVOVolume::animateTextures()`
`647`	`647`	`// LLVOVolume::updateTextureVirtualSize when the`
`648`	`648`	`// mTextureMatrix is not yet present`
`649`	`649`	`gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_TCOORD);`
`650`		`- mDrawable->getSpatialGroup()->dirtyGeom();`
`651`		`- gPipeline.markRebuild(mDrawable->getSpatialGroup());`
	`650`	`+ LLSpatialGroup* group = mDrawable->getSpatialGroup();`
	`651`	`+ if (group)`
	`652`	`+ {`
	`653`	`+ group->dirtyGeom();`
	`654`	`+ gPipeline.markRebuild(group);`
	`655`	`+ }`
`652`	`656`	`}`
`653`	`657`	`}`
`654`	`658`