diff options
| author | Richard Nelson <none@none> | 2010-07-12 11:24:05 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-07-12 11:24:05 -0700 |
| commit | 1ec1ee9bdfe9545389fc69b1c55b25cdb5549dc8 (patch) | |
| tree | c19a55e179b9d3a4c82fd3c7ce931298ad43c226 /indra/newview/llviewerinventory.cpp | |
| parent | d3f114d6901877bb79ae9719f59d681fa6a9d494 (diff) | |
| parent | ca54ac338eabb2dc17f36550a25433ade4002f0e (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 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()) |