Skip to content
Snippets Groups Projects
Commit 7e2b88a3 authored by Loren Shih's avatar Loren Shih
Browse files

EXT-2867 : Crash after toggling gestures on and off

Observer wasn't being removed when class was deleted.

--HG--
branch : avatar-pipeline
parent f2da2c00
No related branches found
No related tags found
No related merge requests found
......@@ -168,6 +168,7 @@ LLFloaterGesture::~LLFloaterGesture()
LLGestureManager::instance().removeObserver(mObserver);
delete mObserver;
mObserver = NULL;
gInventory.removeObserver(this);
}
// virtual
......
......@@ -63,6 +63,15 @@
#include "llsdutil.h"
#include <deque>
LLInventoryObserver::LLInventoryObserver()
{
}
// virtual
LLInventoryObserver::~LLInventoryObserver()
{
}
void LLInventoryCompletionObserver::changed(U32 mask)
{
// scan through the incomplete items and move or erase them as
......
......@@ -63,7 +63,8 @@ class LLInventoryObserver
CALLING_CARD = 32, // online, grant status, cancel, etc change
ALL = 0xffffffff
};
virtual ~LLInventoryObserver() {};
LLInventoryObserver();
virtual ~LLInventoryObserver();
virtual void changed(U32 mask) = 0;
std::string mMessageName; // used by Agent Inventory Service only. [DEV-20328]
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment