livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-23122 BUG-225920 - Remove longtime broken "RenderAnimateRes" setting.

meow-7.2.2
Beq 2018-12-07 10:18:35 +00:00
parent 12481f4f8f
commit f340262db2
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/settings.xml
View File

@ -11765,7 +11765,7 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>RenderAnimateRes</key>
<map>
<key>Comment</key>
<string>Animate rezing prims.</string>
<string>(Obsolete) Does nothing Animate rezing prims.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>

23
indra/newview/pipeline.cpp
View File

@ -151,7 +151,7 @@ bool LLPipeline::RenderDeferredSSAO;
F32 LLPipeline::RenderShadowResolutionScale;
bool LLPipeline::RenderLocalLights;
bool LLPipeline::RenderDelayCreation;
bool LLPipeline::RenderAnimateRes;
//bool LLPipeline::RenderAnimateRes; <FS:Beq> 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"); <FS:Beq> 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"); <FS:Beq> 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();
}
// <FS:Beq> 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();
//}
}

2
indra/newview/pipeline.h
View File

@ -902,7 +902,7 @@ public:
static F32 RenderShadowResolutionScale;
static bool RenderLocalLights;
static bool RenderDelayCreation;
static bool RenderAnimateRes;
// static bool RenderAnimateRes; <FS:Beq> FIRE-23122 BUG-225920 Remove broken RenderAnimateRes functionality.
static bool FreezeTime;
static S32 DebugBeaconLineWidth;
static F32 RenderHighlightBrightness;