diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-12-03 09:17:51 -0800 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-12-03 09:17:51 -0800 |
| commit | 5fd2938da8d6709a6596833088fd83c60d591507 (patch) | |
| tree | 9186f79b996eb60a9bb1f5cefada86c0596ac850 /indra/llui/llview.h | |
| parent | 97f97f286ccca1f736c575f516a61c6a32787807 (diff) | |
| parent | 57b68d9bfe25fc7b9efe41a9fa30935c156acb34 (diff) | |
Merge with recent viewer-2-0
Diffstat (limited to 'indra/llui/llview.h')
| -rw-r--r-- | indra/llui/llview.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/indra/llui/llview.h b/indra/llui/llview.h index 2607120e17..d485244a05 100644 --- a/indra/llui/llview.h +++ b/indra/llui/llview.h @@ -111,10 +111,7 @@ public: Alternative<std::string> string; Alternative<U32> flags; - Follows() - : string(""), - flags("flags", FOLLOWS_LEFT | FOLLOWS_TOP) - {} + Follows(); }; struct Params : public LLInitParam::Block<Params> @@ -659,4 +656,11 @@ template <class T> T* LLView::getChild(const std::string& name, BOOL recurse) co return result; } +// Compiler optimization - don't generate these specializations inline, +// require explicit specialization. See llbutton.cpp for an example. +#ifndef LLVIEW_CPP +extern template class LLView* LLView::getChild<class LLView>( + const std::string& name, BOOL recurse) const; +#endif + #endif //LL_LLVIEW_H |