diff options
author | Richard Linden <none@none> | 2011-10-15 18:14:23 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-10-15 18:14:23 -0700 |
commit | 62d9db2f21b2a6fb579e8f7631a4e387cc5e5b29 (patch) | |
tree | 54587047f6f27d3a1b58a23a1a532a4436e61f65 /indra/llui/llpanel.h | |
parent | 94c137d5c970bc01e3a4dbe8de6a7104085e5ba6 (diff) | |
parent | fc2bd1cce2e6c213fa682b9768d435a4e394a95e (diff) |
Automated merge with http://hg.secondlife.com/viewer-development
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 |