diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-06 19:20:03 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-06 19:20:03 -0400 |
| commit | 52615d251bc9261fe5765feefbcd31021bd75934 (patch) | |
| tree | 2e259b393c6d2405d4a5e30ae9dd25e282c78a4d /indra/llcommon/llinstancetracker.cpp | |
| parent | 0a802ae351153008b40d42106c866836d0ee4954 (diff) | |
| parent | a1a5a793a70f62c977e97b7433840fcb70f47c03 (diff) | |
pull pack late beta fixes from 2.6.3
Diffstat (limited to 'indra/llcommon/llinstancetracker.cpp')
| -rw-r--r-- | indra/llcommon/llinstancetracker.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/indra/llcommon/llinstancetracker.cpp b/indra/llcommon/llinstancetracker.cpp index 89bc6cca39..f576204511 100644 --- a/indra/llcommon/llinstancetracker.cpp +++ b/indra/llcommon/llinstancetracker.cpp @@ -32,6 +32,17 @@ // external library headers // other Linden headers -// llinstancetracker.h is presently header-only. This file exists only because our CMake -// test macro ADD_BUILD_TEST requires it. -int dummy = 0; +//static +void * & LLInstanceTrackerBase::getInstances(std::type_info const & info) +{ + static std::map<std::string, void *> instances; + + std::string k = info.name(); + if(instances.find(k) == instances.end()) + { + instances[k] = NULL; + } + + return instances[k]; +} + |