diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h
index d66ea33c0c0ef7cf4caa3a9043f0365ad3ab3fe2..25bdba0a0d80848a04bf1ad77504c651ea395e57 100755
--- a/indra/llcommon/llsingleton.h
+++ b/indra/llcommon/llsingleton.h
@@ -67,7 +67,7 @@ class LLSingletonBase: private boost::noncopyable
     void add_master();
     void remove_master();
     // with a little help from our friends.
-    template <class T> friend class LLSingleton_manage_master;
+    template <class T> friend struct LLSingleton_manage_master;
 
     // Maintain a stack of the LLSingleton subclass instance currently being
     // initialized. We use this to notice direct dependencies: we want to know