diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-18 17:40:04 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-18 17:40:04 -0400 |
| commit | 53ce47fc1c2a713c6d7dd7fd9f98e50de727b974 (patch) | |
| tree | fcc220f37f0de56d63c5f501e7c577463106eb69 /indra/llui/llpanel.h | |
| parent | f36cf6f1bad7e239011ab3ad40dca8002f42083c (diff) | |
| parent | 395a29717026221255d8bed57098afa52c49bff9 (diff) | |
merge changes for STORM-1654
Diffstat (limited to 'indra/llui/llpanel.h')
| -rw-r--r-- | indra/llui/llpanel.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h index 790025cb2d..ab1c87caff 100644 --- a/indra/llui/llpanel.h +++ b/indra/llui/llpanel.h @@ -96,9 +96,6 @@ public: Params(); }; - // valid children for LLPanel are stored in this registry - typedef LLDefaultChildRegistry child_registry_t; - protected: friend class LLUICtrlFactory; // RN: for some reason you can't just use LLUICtrlFactory::getDefaultParams as a default argument in VC8 |