diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-08 09:24:58 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-08 09:24:58 -0400 |
| commit | ed32a5e2b8e865cfad1d697fd5542b05162c40a9 (patch) | |
| tree | 36616fdac52c4149dd88204054e9cf7e1342ff87 /indra/llcommon/llinstancetracker.cpp | |
| parent | 9c2f2b884a16d180f83e76d3ed58c949c9692eaf (diff) | |
| parent | 444311d58082ae1277a3628fbe380f7407910f50 (diff) | |
pull tags and late fixes back from viewer-pre-release
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]; +} + |