diff options
| author | Richard Linden <none@none> | 2013-04-24 14:13:59 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-04-24 14:13:59 -0700 |
| commit | 98161b566d6fa16ae67a48c98b8b087b0ad8d694 (patch) | |
| tree | 03cec9453c18f53b3120e07ba74b4313e8c46541 /indra/llcommon/llsingleton.cpp | |
| parent | 8026ac0dc9cb98eec6bb34cb6766c4150f876bf8 (diff) | |
| parent | 84af0e9852486231b5ef0cde7ad1704d41689a3a (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/llcommon/llsingleton.cpp')
| -rw-r--r-- | indra/llcommon/llsingleton.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llcommon/llsingleton.cpp b/indra/llcommon/llsingleton.cpp index eb8e2c9456..9b49e52377 100644 --- a/indra/llcommon/llsingleton.cpp +++ b/indra/llcommon/llsingleton.cpp @@ -28,5 +28,4 @@ #include "llsingleton.h" -std::map<std::string, void *> * LLSingletonRegistry::sSingletonMap = NULL; |