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

Make animation overrider react correctly when the UseAO control changes.

meow-7.2.2
ziree 2012-02-01 14:19:38 +01:00
parent c6099ef50a
commit 0002a87afb
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/aoengine.cpp
View File

@ -62,6 +62,7 @@ AOEngine::AOEngine() :
mLastMotion(ANIM_AGENT_STAND),
mLastOverriddenMotion(ANIM_AGENT_STAND)
{
gSavedPerAccountSettings.getControl("UseAO")->getCommitSignal()->connect(boost::bind(&AOEngine::onToggleAOControl, this));
}
AOEngine::~AOEngine()
@ -80,6 +81,11 @@ void AOEngine::onLoginComplete()
AOEngine::instance().init();
}
void AOEngine::onToggleAOControl()
{
enable(gSavedPerAccountSettings.getBOOL("UseAO"));
}
void AOEngine::clear( bool aFromTimer )
{
mOldSets.insert( mOldSets.end(), mSets.begin(), mSets.end() );

1
indra/newview/aoengine.h
View File

@ -170,6 +170,7 @@ class AOEngine
BOOL createAnimationLink(const AOSet* set,AOSet::AOState* state,const LLInventoryItem* item);
void purgeFolder(const LLUUID& uuid) const;
void onToggleAOControl();
static void onNotecardLoadComplete( LLVFS* vfs,const LLUUID& assetUUID,LLAssetType::EType type,
void* userdata,S32 status,LLExtStat extStatus);
void parseNotecard(const char* buffer);