diff options
author | James Cook <james@lindenlab.com> | 2009-11-30 14:42:34 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-11-30 14:42:34 -0800 |
commit | d83f934ec87e594b7e88267bdd1be938a73f090d (patch) | |
tree | 2fc1bc60f960e3139f3da799b7d93c9a08f8e7c6 /indra/llui/llpanel.cpp | |
parent | 1ec8ca378814b7f493f5f6e55fb505b5c884a995 (diff) | |
parent | 7d3b3cc474822db144b623980d08b7addc2f77ff (diff) |
merge
Diffstat (limited to 'indra/llui/llpanel.cpp')
-rw-r--r-- | indra/llui/llpanel.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp index dc5db03a44..750b190953 100644 --- a/indra/llui/llpanel.cpp +++ b/indra/llui/llpanel.cpp @@ -34,6 +34,7 @@ #include "linden_common.h" +#define LLPANEL_CPP #include "llpanel.h" #include "llalertdialog.h" @@ -59,8 +60,8 @@ static LLDefaultChildRegistry::Register<LLPanel> r1("panel", &LLPanel::fromXML); // Compiler optimization, generate extern template -//template class LLPanel* LLView::getChild<class LLPanel>( -// const std::string& name, BOOL recurse) const; +template class LLPanel* LLView::getChild<class LLPanel>( + const std::string& name, BOOL recurse) const; LLPanel::LocalizedString::LocalizedString() : name("name"), |