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

FIRE-32315: Animation preview sometimes fails when FS AO is enabled

master
Zi Ree 2022-10-23 19:09:15 +02:00
parent 70b500bf3d
commit d444e9d5b4
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llfloaterbvhpreview.cpp
View File

@ -67,6 +67,8 @@
#include "llviewercontrol.h" // for gSavedSettings
#include "llvoavatarself.h"
#include "aoengine.h" // <FS:Zi> FIRE-32315: Animation preview sometimes fails when FS AO is enabled
S32 LLFloaterBvhPreview::sOwnAvatarInstanceCount = 0; // <FS> Preview on own avatar
const S32 PREVIEW_BORDER_WIDTH = 2;
@ -137,6 +139,13 @@ LLFloaterBvhPreview::LLFloaterBvhPreview(const std::string& filename) :
if (mUseOwnAvatar)
{
sOwnAvatarInstanceCount++;
// // Switch FS AO off during preview
mAOEnabled = gSavedPerAccountSettings.getBOOL("UseAO");
if (mAOEnabled)
{
AOEngine::getInstance()->enable(false);
}
}
// </FS>
@ -535,6 +544,12 @@ LLFloaterBvhPreview::~LLFloaterBvhPreview()
gAgentAvatarp->startDefaultMotions();
gAgentAvatarp->startMotion(ANIM_AGENT_STAND);
}
// Switch FS AO back on if it was disabled during preview
if (mAOEnabled)
{
AOEngine::getInstance()->enable(true);
}
}
// </FS>

3
indra/newview/llfloaterbvhpreview.h
View File

@ -158,6 +158,9 @@ protected:
// <FS:Sei> FIRE-17277: Allow entering Loop In/Loop Out as frames
S32 mNumFrames;
// <FS:Zi> FIRE-32315: Animation preview sometimes fails when FS AO is enabled
bool mAOEnabled;
};
#endif // LL_LLFLOATERBVHPREVIEW_H