summaryrefslogtreecommitdiff
path: root/indra/llui/lluictrlfactory.h
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2010-08-23 14:31:39 -0700
committerRichard Nelson <richard@lindenlab.com>2010-08-23 14:31:39 -0700
commitd1294e5aeb78205cbc580b8159f0a15b2102bd26 (patch)
tree336b7e70dee9587d94cbe39860e5ff1474d2e76e /indra/llui/lluictrlfactory.h
parent2ddeabec91cf14d252e7a0d4687fe2a46eeff8b7 (diff)
fix for gcc
Diffstat (limited to 'indra/llui/lluictrlfactory.h')
-rw-r--r--indra/llui/lluictrlfactory.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h
index 82076335d7..207f74c89a 100644
--- a/indra/llui/lluictrlfactory.h
+++ b/indra/llui/lluictrlfactory.h
@@ -229,7 +229,9 @@ fail:
static bool getLocalizedXMLNode(const std::string &xui_filename, LLXMLNodePtr& root);
private:
+ //NOTE: both friend declarations are necessary to keep both gcc and msvc happy
template <typename T> friend class LLChildRegistry;
+ template <typename T> template <typename U> friend class LLChildRegistry<T>::Register;
static void copyName(LLXMLNodePtr src, LLXMLNodePtr dest);