diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-08-11 12:21:55 -0400 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-08-11 12:21:55 -0400 |
| commit | dc2d11d3de38d42b3d696abeb189c923881b6f63 (patch) | |
| tree | e85be2840a69de1bdccad31e7bdab903803ed1b4 /indra/llcommon/llsingleton.cpp | |
| parent | b2632c50efc12eacdcadace64e6c0f1906b86ff6 (diff) | |
| parent | 8f4811f3fd7f252a5f5bc50ed11fecd8e42f3e68 (diff) | |
Merged in my latest work including improved version of DEV-35401 "doubleton" workaround and LLFloaterTOS post-merge fixups.
Diffstat (limited to 'indra/llcommon/llsingleton.cpp')
| -rw-r--r-- | indra/llcommon/llsingleton.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llsingleton.cpp b/indra/llcommon/llsingleton.cpp index 62988cdc64..6b5feaf1c4 100644 --- a/indra/llcommon/llsingleton.cpp +++ b/indra/llcommon/llsingleton.cpp @@ -34,5 +34,5 @@ #include "llsingleton.h" -std::map<std::string, void *> LLSingletonRegistry::sSingletonMap; +std::map<std::string, void *> * LLSingletonRegistry::sSingletonMap = NULL; |