diff options
| author | Richard Nelson <none@none> | 2010-07-02 10:35:52 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-07-02 10:35:52 -0700 |
| commit | aa57d82043fd8d708dcd40d3253fdf2f6d067931 (patch) | |
| tree | 6540575c7536cd59641195602851a4d6cccb494c /indra/newview/llviewerinventory.cpp | |
| parent | 0ad0eaa78f39790e65a2568bce096ca7d150e132 (diff) | |
| parent | 18224f89047ab580e4bcb41e29bcb18f815410b2 (diff) | |
merge
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 3430f265ae..2bf05d5907 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -839,6 +839,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()) |