diff options
author | James Cook <james@lindenlab.com> | 2009-12-01 11:47:13 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-12-01 11:47:13 -0800 |
commit | dd6fa93d84a267c6367f83c2d7581207e6dd878d (patch) | |
tree | 1a40f8b6dc205addad73637f4d02caa060c88838 /indra/llui/llview.cpp | |
parent | 27351b8bf59c3b2cfc31c27947397055a40b52d7 (diff) | |
parent | 8025c15a71fa1ee9fa34781f7cf74dde8c4e622b (diff) |
merge
Diffstat (limited to 'indra/llui/llview.cpp')
-rw-r--r-- | indra/llui/llview.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index dba24ee165..23e4131e6d 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -33,6 +33,7 @@ #include "linden_common.h" +#define LLVIEW_CPP #include "llview.h" #include <cassert> @@ -76,8 +77,17 @@ std::vector<LLViewDrawContext*> LLViewDrawContext::sDrawContextStack; BOOL LLView::sIsDrawing = FALSE; #endif +// Compiler optimization, generate extern template +template class LLView* LLView::getChild<class LLView>( + const std::string& name, BOOL recurse) const; + static LLDefaultChildRegistry::Register<LLView> r("view"); +LLView::Follows::Follows() +: string(""), + flags("flags", FOLLOWS_LEFT | FOLLOWS_TOP) +{} + LLView::Params::Params() : name("name", std::string("unnamed")), enabled("enabled", true), |