diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-13 17:20:00 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-13 17:20:00 +0300 |
| commit | 2a1b8318bd6b8175012df51e5b0eb18acee01d1b (patch) | |
| tree | 4ad003b939788e1b6005f22f5b8a81fbef348da5 /indra/newview/llviewerinventory.cpp | |
| parent | fa3a77abdd2bd7218cc193f9d4d52a1ee73beb7d (diff) | |
| parent | c8602b293517dfb4d5c6658ab235af9fe9932b7e (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index 1ff4d6db9e..cbc86c89cc 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -847,6 +847,21 @@ LLInventoryCallbackManager::~LLInventoryCallbackManager() sInstance = NULL; } +//static +void LLInventoryCallbackManager::destroyClass() +{ + if (sInstance) + { + for (callback_map_t::iterator it = sInstance->mMap.begin(), end_it = sInstance->mMap.end(); it != end_it; ++it) + { + // drop LLPointer reference to callback + it->second = NULL; + } + sInstance->mMap.clear(); + } +} + + U32 LLInventoryCallbackManager::registerCB(LLPointer<LLInventoryCallback> cb) { if (cb.isNull()) |