diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-05-02 09:05:56 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-05-02 09:05:56 -0700 |
| commit | f393774caf49313f24d33cb2b33b6ad92c70977f (patch) | |
| tree | ebdaf44b4c3152362f3e9b18c227bd09d39031d5 /indra/llcommon/llinstancetracker.cpp | |
| parent | 31e16be0daa10e6d66b133c308130524a7a0d881 (diff) | |
| parent | b9bb792c478d703c6442351ecb563c0a67f77111 (diff) | |
Merge from lindenlab/viewer-development
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]; +} + |