diff options
author | Merov Linden <merov@lindenlab.com> | 2013-10-04 09:47:26 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-10-04 09:47:26 -0700 |
commit | 1e32b9dd33fb9e2f0d9a7935a3696b423a191354 (patch) | |
tree | adeadd5ef0b8c4514b325f74c3426b2af76e422b /indra/llcommon/llsingleton.cpp | |
parent | f53b2bd880875b5194b6d298e1aad7d8951db9f3 (diff) | |
parent | f7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff) |
Pull merge of lindenlab/viewer-release
Diffstat (limited to 'indra/llcommon/llsingleton.cpp')
-rwxr-xr-x | 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 100755 --- 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; |