diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-13 18:54:16 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-13 18:54:16 +0300 |
| commit | b5ab9c07031ffadb77792c312ca2bb1131d90fb0 (patch) | |
| tree | 499b01923892a406d306eadd4507e6d7a41b471b /indra/newview/llviewerinventory.cpp | |
| parent | eb6153d2c3cb1e2105804e28f81f894873315545 (diff) | |
| parent | c201038aba861b1166d367fcf5986e33644ec018 (diff) | |
Manual merge from default branch
Resolved conflicts in llpaneloutfitedit.cpp
--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()) |