diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-10-04 11:27:59 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-10-04 11:27:59 -0700 |
| commit | 98a89748789034a53f129e19d06649d79b384c52 (patch) | |
| tree | 39a1aefb35402db02c8791bc3e5735c36116f426 /indra/llcommon/llsingleton.cpp | |
| parent | 796be733b374beb5660ee2713fc28c4e69331cbd (diff) | |
| parent | 1e32b9dd33fb9e2f0d9a7935a3696b423a191354 (diff) | |
Pull merge from viewer-fbc
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; |