diff options
author | Merov Linden <merov@lindenlab.com> | 2010-12-22 14:06:46 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-12-22 14:06:46 -0800 |
commit | c86d6a7bbb7c0db7665b76cf52b12b90c6e98c6d (patch) | |
tree | 1056d6dc941e2aed458b459901fbb448c6e40ef7 /indra/llui/llview.h | |
parent | ab100825bd0064dc64b9ef8bea1c70bc04090716 (diff) | |
parent | 6182ded4e9b4ba076add7a840c535589d36ec283 (diff) |
STORM-808 : merge webkit upgrade to Qt v4.7.1
Diffstat (limited to 'indra/llui/llview.h')
-rw-r--r-- | indra/llui/llview.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/indra/llui/llview.h b/indra/llui/llview.h index a5d8e31640..d2bbd663b8 100644 --- a/indra/llui/llview.h +++ b/indra/llui/llview.h @@ -413,14 +413,9 @@ public: LLControlVariable *findControl(const std::string& name); - // Moved setValue(), getValue(), setControlValue(), setControlName(), - // controlListener() to LLUICtrl because an LLView is NOT assumed to - // contain a value. If that's what you want, use LLUICtrl instead. -// virtual bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata); - const child_list_t* getChildList() const { return &mChildList; } - const child_list_const_iter_t beginChild() { return mChildList.begin(); } - const child_list_const_iter_t endChild() { return mChildList.end(); } + child_list_const_iter_t beginChild() const { return mChildList.begin(); } + child_list_const_iter_t endChild() const { return mChildList.end(); } // LLMouseHandler functions // Default behavior is to pass events to children |