diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-12-29 13:23:02 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-12-29 13:23:02 -0500 |
| commit | 5f99331f4a9ed5ed78af7b47bdad152949e63ec4 (patch) | |
| tree | 78aa91b7a1ac5f31a4e1de11f1a30d4b53561a05 /indra/llui/llview.h | |
| parent | ed365b9c0eea12fa30629be7d26605b77eeedc05 (diff) | |
| parent | 087c105317058dc3a011c937a5aceaf87fdecc26 (diff) | |
Automated merge up from viewer-development
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 b7cd87e269..7e84eafce4 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 |