diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-03-14 23:21:38 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-03-14 23:21:38 +0000 |
| commit | 04611efae8a3291ceba8a29dd920bdae0d404830 (patch) | |
| tree | 43966566a1eeb42cf546a638310348f0585fc395 /indra/llui/llmenugl.h | |
| parent | c0c5bdbbb90e0bcdab558ec22ea352c9d08dc078 (diff) | |
[NOTE: This was an erroneous commit, and was reverted in the next revision]
QAR-369 - viewer-cleanup2-7 81916 merged into release.
Diffstat (limited to 'indra/llui/llmenugl.h')
| -rw-r--r-- | indra/llui/llmenugl.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h index e9b80e562b..33b226fd99 100644 --- a/indra/llui/llmenugl.h +++ b/indra/llui/llmenugl.h @@ -225,7 +225,7 @@ private: // calls a user defined callback. //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -class LLMenuItemCallGL : public LLMenuItemGL +class LLMenuItemCallGL : public LLMenuItemGL, public LLObservable { public: // normal constructor @@ -291,7 +291,6 @@ public: //virtual void draw(); - virtual bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata); private: menu_callback mCallback; @@ -341,7 +340,7 @@ public: void setCheckedControl(LLString checked_control, LLView *context); - virtual void setValue(const LLSD& value) { mChecked = value.asBoolean(); } + virtual void setValue(const LLSD& value); virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_MENU_ITEM_CHECK; } virtual LLString getWidgetTag() const { return LL_MENU_ITEM_CHECK_GL_TAG; } @@ -350,8 +349,6 @@ public: // called to rebuild the draw label virtual void buildDrawLabel( void ); - virtual bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata); - private: check_callback mCheckCallback; BOOL mChecked; |