diff options
| author | skolb <none@none> | 2009-12-01 13:34:16 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2009-12-01 13:34:16 -0800 |
| commit | 0ab6d36094cc52eea063f6d3b05262c111857f29 (patch) | |
| tree | 95840e0bf49f744520649b030d4bd65b99275bcf /indra/llui/llview.h | |
| parent | 6dd3f54924b57224298f6d76c766b403d165783f (diff) | |
| parent | 6a888b653a1ee5ed0eeedd8994ff59652f2913aa (diff) | |
Merge
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 |