Migrate to boost::bind for a bunch of CommitCallbacks. Converted several static member functions to nonstatic member functions
This commit is contained in:
@@ -50,8 +50,7 @@ LLMultiGesture::LLMultiGesture()
|
||||
mSteps(),
|
||||
mPlaying(FALSE),
|
||||
mCurrentStep(0),
|
||||
mDoneCallback(NULL),
|
||||
mCallbackData(NULL)
|
||||
mDoneCallback(NULL)
|
||||
{
|
||||
reset();
|
||||
}
|
||||
|
||||
@@ -100,8 +100,7 @@ public:
|
||||
// Timer for waiting
|
||||
LLFrameTimer mWaitTimer;
|
||||
|
||||
void (*mDoneCallback)(LLMultiGesture* gesture, void* data);
|
||||
void* mCallbackData;
|
||||
boost::function<void (LLMultiGesture*)> mDoneCallback;
|
||||
|
||||
// Animations that we requested to start
|
||||
std::set<LLUUID> mRequestedAnimIDs;
|
||||
|
||||
Reference in New Issue
Block a user