diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-08-04 15:44:45 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-08-04 15:44:45 -0700 |
| commit | 6f256e2d57d6814fdb97809405989c54ab148c6b (patch) | |
| tree | 0584e6231bf80e9919e7bf30caceece94b25deb4 /indra/newview/llviewerinventory.cpp | |
| parent | a97bcb7c7fd705818b7f36af2c4a915e85ff5604 (diff) | |
| parent | eefe3388da83ce3e368af28ba466c27644f156c8 (diff) | |
Merge with dessie/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 4cc410e63b..2d4f36cdcf 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -873,6 +873,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()) |