diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-02 18:17:51 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-02 18:17:51 +0200 |
commit | abb23ff31260e9632406dae03be920a23220d719 (patch) | |
tree | a24029245cf2ca511f3893e1b42e04ac3e9a90db /indra/llui/llcheckboxctrl.cpp | |
parent | 9d8b189886ae14800d58f9729d8c8ea9b338ed52 (diff) | |
parent | f496c2b164a100836d74909c3e27adcdf98018f0 (diff) |
Manual merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/llcheckboxctrl.cpp')
-rw-r--r-- | indra/llui/llcheckboxctrl.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llui/llcheckboxctrl.cpp b/indra/llui/llcheckboxctrl.cpp index 7f0f9751db..cd10dfdb1c 100644 --- a/indra/llui/llcheckboxctrl.cpp +++ b/indra/llui/llcheckboxctrl.cpp @@ -33,6 +33,7 @@ // The mutants are coming! #include "linden_common.h" +#define LLCHECKBOXCTRL_CPP #include "llcheckboxctrl.h" #include "llgl.h" @@ -50,6 +51,10 @@ const U32 MAX_STRING_LENGTH = 10; static LLDefaultChildRegistry::Register<LLCheckBoxCtrl> r("check_box"); +// Compiler optimization, generate extern template +template class LLCheckBoxCtrl* LLView::getChild<class LLCheckBoxCtrl>( + const std::string& name, BOOL recurse) const; + LLCheckBoxCtrl::Params::Params() : text_enabled_color("text_enabled_color"), text_disabled_color("text_disabled_color"), |