diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-07-13 05:27:27 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-07-13 05:27:27 -0700 |
| commit | c201038aba861b1166d367fcf5986e33644ec018 (patch) | |
| tree | c9b0379d1936736de93ae3dc2489e54dce96e604 /indra/newview/llviewerinventory.cpp | |
| parent | b45271834161018be8c825e96c64d9ef7b67401c (diff) | |
| parent | c8602b293517dfb4d5c6658ab235af9fe9932b7e (diff) | |
Merged from viewer-release
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()) |