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

Make fix for FIRE-20152 a bit nicer

master
Ansariel 2016-10-25 16:09:07 +02:00
parent e49e54ab3d
commit fb527506d5
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/fsavatarrenderpersistence.cpp
View File

@ -36,6 +36,7 @@ FSAvatarRenderPersistence::FSAvatarRenderPersistence()
FSAvatarRenderPersistence::~FSAvatarRenderPersistence()
{
saveAvatarRenderSettings();
}
void FSAvatarRenderPersistence::init()

2
indra/newview/fsavatarrenderpersistence.h
View File

@ -40,7 +40,6 @@ friend class FSPanelPreferenceBackup;
public:
void init();
void saveAvatarRenderSettings();
LLVOAvatar::VisualMuteSettings getAvatarRenderSettings(const LLUUID& avatar_id);
void setAvatarRenderSettings(const LLUUID& avatar_id, LLVOAvatar::VisualMuteSettings render_settings);
@ -59,6 +58,7 @@ private:
virtual ~FSAvatarRenderPersistence();
void loadAvatarRenderSettings();
void saveAvatarRenderSettings();
avatar_render_setting_t mAvatarRenderMap;

2
indra/newview/llappviewer.cpp
View File

@ -2045,7 +2045,7 @@ bool LLAppViewer::cleanup()
// <FS:ND> FIRE-20152; save avatar render settings during cleanup, not in the dtor of the static instance.
// Otherwise the save will happen during crt termination when most of the viewers infrastructure is in a non deterministic state
if( FSAvatarRenderPersistence::instanceExists() )
FSAvatarRenderPersistence::getInstance()->saveAvatarRenderSettings();
FSAvatarRenderPersistence::getInstance()->deleteSingleton();
// </FS:ND>
// Must clean up texture references before viewer window is destroyed.