diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2011-03-21 17:40:49 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2011-03-21 17:40:49 -0400 |
| commit | fa4359e571fb67aca651efc3403274cdf0bb2616 (patch) | |
| tree | 029261cf0981e0472f2bd34bbae20dbcfbc26925 /indra/llcommon/llinstancetracker.cpp | |
| parent | 3f3429fa6854c6462abf3bbabf4af1dbbeb4c337 (diff) | |
| parent | b9a9b0017dd4714cbca4b0ddb69ed5e6b2f09528 (diff) | |
STORM-1051: merge daggy fix to tip
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]; +} + |