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/lltextbox.cpp | |
parent | 1ec8ca378814b7f493f5f6e55fb505b5c884a995 (diff) | |
parent | 7d3b3cc474822db144b623980d08b7addc2f77ff (diff) |
merge
Diffstat (limited to 'indra/llui/lltextbox.cpp')
-rw-r--r-- | indra/llui/lltextbox.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp index 4bd9a32b1d..0bd0ab59fb 100644 --- a/indra/llui/lltextbox.cpp +++ b/indra/llui/lltextbox.cpp @@ -31,7 +31,10 @@ */ #include "linden_common.h" + +#define LLTEXTBOX_CPP #include "lltextbox.h" + #include "lluictrlfactory.h" #include "llfocusmgr.h" #include "llwindow.h" @@ -41,8 +44,8 @@ static LLDefaultChildRegistry::Register<LLTextBox> r("text"); // Compiler optimization, generate extern template -//template class LLTextBox* LLView::getChild<class LLTextBox>( -// const std::string& name, BOOL recurse) const; +template class LLTextBox* LLView::getChild<class LLTextBox>( + const std::string& name, BOOL recurse) const; LLTextBox::LLTextBox(const LLTextBox::Params& p) : LLTextBase(p), |