diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index cbca5e04a2..a611bc0a14 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11765,7 +11765,7 @@ Change of this parameter will affect the layout of buttons in notification toast RenderAnimateRes Comment - Animate rezing prims. + (Obsolete) Does nothing Animate rezing prims. Persist 1 Type diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 391c0278b1..dd4a3f8462 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -151,7 +151,7 @@ bool LLPipeline::RenderDeferredSSAO; F32 LLPipeline::RenderShadowResolutionScale; bool LLPipeline::RenderLocalLights; bool LLPipeline::RenderDelayCreation; -bool LLPipeline::RenderAnimateRes; +//bool LLPipeline::RenderAnimateRes; FIRE-23122 BUG-225920 Remove broken RenderAnimateRes functionality. bool LLPipeline::FreezeTime; S32 LLPipeline::DebugBeaconLineWidth; F32 LLPipeline::RenderHighlightBrightness; @@ -627,7 +627,7 @@ void LLPipeline::init() connectRefreshCachedSettingsSafe("RenderShadowResolutionScale"); connectRefreshCachedSettingsSafe("RenderLocalLights"); connectRefreshCachedSettingsSafe("RenderDelayCreation"); - connectRefreshCachedSettingsSafe("RenderAnimateRes"); +// connectRefreshCachedSettingsSafe("RenderAnimateRes"); FIRE-23122 BUG-225920 Remove broken RenderAnimateRes functionality. connectRefreshCachedSettingsSafe("FreezeTime"); connectRefreshCachedSettingsSafe("DebugBeaconLineWidth"); connectRefreshCachedSettingsSafe("RenderHighlightBrightness"); @@ -1209,7 +1209,7 @@ void LLPipeline::refreshCachedSettings() RenderShadowResolutionScale = gSavedSettings.getF32("RenderShadowResolutionScale"); RenderLocalLights = gSavedSettings.getBOOL("RenderLocalLights"); RenderDelayCreation = gSavedSettings.getBOOL("RenderDelayCreation"); - RenderAnimateRes = gSavedSettings.getBOOL("RenderAnimateRes"); +// RenderAnimateRes = gSavedSettings.getBOOL("RenderAnimateRes"); FIRE-23122 BUG-225920 Remove broken RenderAnimateRes functionality. FreezeTime = gSavedSettings.getBOOL("FreezeTime"); DebugBeaconLineWidth = gSavedSettings.getS32("DebugBeaconLineWidth"); RenderHighlightBrightness = gSavedSettings.getF32("RenderHighlightBrightness"); @@ -2018,14 +2018,15 @@ void LLPipeline::createObject(LLViewerObject* vobj) markRebuild(drawablep, LLDrawable::REBUILD_ALL, TRUE); - if (drawablep->getVOVolume() && RenderAnimateRes) - { - // fun animated res - drawablep->updateXform(TRUE); - drawablep->clearState(LLDrawable::MOVE_UNDAMPED); - drawablep->setScale(LLVector3(0,0,0)); - drawablep->makeActive(); - } + // FIRE-23122 BUG-225920 Remove broken RenderAnimateRes functionality. + //if (drawablep->getVOVolume() && RenderAnimateRes) + //{ + // // fun animated res + // drawablep->updateXform(TRUE); + // drawablep->clearState(LLDrawable::MOVE_UNDAMPED); + // drawablep->setScale(LLVector3(0,0,0)); + // drawablep->makeActive(); + //} } diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index 53640dfa95..9e5b48a273 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -902,7 +902,7 @@ public: static F32 RenderShadowResolutionScale; static bool RenderLocalLights; static bool RenderDelayCreation; - static bool RenderAnimateRes; +// static bool RenderAnimateRes; FIRE-23122 BUG-225920 Remove broken RenderAnimateRes functionality. static bool FreezeTime; static S32 DebugBeaconLineWidth; static F32 RenderHighlightBrightness;