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/llbutton.cpp | |
| parent | 1ec8ca378814b7f493f5f6e55fb505b5c884a995 (diff) | |
| parent | 7d3b3cc474822db144b623980d08b7addc2f77ff (diff) | |
merge
Diffstat (limited to 'indra/llui/llbutton.cpp')
| -rw-r--r-- | indra/llui/llbutton.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index 617a97b6cf..7721137e29 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -32,6 +32,7 @@ #include "linden_common.h" +#define LLBUTTON_CPP #include "llbutton.h" // Linden library includes @@ -57,8 +58,8 @@ static LLDefaultChildRegistry::Register<LLButton> r("button"); // Compiler optimization, generate extern template -//template class LLButton* LLView::getChild<class LLButton>( -// const std::string& name, BOOL recurse) const; +template class LLButton* LLView::getChild<class LLButton>( + const std::string& name, BOOL recurse) const; // globals loaded from settings.xml S32 LLBUTTON_H_PAD = 0; |