diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-04-20 11:26:12 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-04-20 11:26:12 -0400 |
| commit | b68d1a0f50c073257fb48692b666bb692d0c9981 (patch) | |
| tree | 46ca2d8a49a2fd8dc3d98db6da926faf84c31b8a /indra/llcommon/llinstancetracker.cpp | |
| parent | 6715603b6a991f822274b000e5d8fb9b8d405464 (diff) | |
| parent | da7cd9f8117757cd6acb0a5e93bc3c60443374f9 (diff) | |
Merge viewer-pre-beta -> seraph-viewer-pre-beta
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]; +} + |