aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/llmenugl.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:16 -0500
committerJacek Antonelli2008-08-15 23:45:16 -0500
commit3f27ba891ac4d032753b219b4b96d1ffbc9fb488 (patch)
tree504932ee91a0356fba7ea48798887c96867e492f /linden/indra/llui/llmenugl.h
parentSecond Life viewer sources 1.18.4.3 (diff)
downloadmeta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.zip
meta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.tar.gz
meta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.tar.bz2
meta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.tar.xz
Second Life viewer sources 1.18.5.0-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/llui/llmenugl.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/linden/indra/llui/llmenugl.h b/linden/indra/llui/llmenugl.h
index 6dc9282..ce33f8a 100644
--- a/linden/indra/llui/llmenugl.h
+++ b/linden/indra/llui/llmenugl.h
@@ -238,11 +238,6 @@ protected:
238 on_disabled_callback mOnDisabledCallback; 238 on_disabled_callback mOnDisabledCallback;
239 239
240public: 240public:
241
242
243 void setMenuCallback(menu_callback callback, void* data) { mCallback = callback; mUserData = data; };
244 void setEnabledCallback(enabled_callback callback) { mEnabledCallback = callback; };
245
246 // normal constructor 241 // normal constructor
247 LLMenuItemCallGL( const LLString& name, 242 LLMenuItemCallGL( const LLString& name,
248 menu_callback clicked_cb, 243 menu_callback clicked_cb,
@@ -288,7 +283,13 @@ public:
288 void setEnabledControl(LLString enabled_control, LLView *context); 283 void setEnabledControl(LLString enabled_control, LLView *context);
289 void setVisibleControl(LLString enabled_control, LLView *context); 284 void setVisibleControl(LLString enabled_control, LLView *context);
290 285
291 virtual void setUserData(void *userdata) { mUserData = userdata; } 286 void setMenuCallback(menu_callback callback, void* data) { mCallback = callback; mUserData = data; };
287 menu_callback getMenuCallback() const { return mCallback; }
288
289 void setEnabledCallback(enabled_callback callback) { mEnabledCallback = callback; };
290
291 void setUserData(void *userdata) { mUserData = userdata; }
292 void* getUserData() const { return mUserData; }
292 293
293 // called to rebuild the draw label 294 // called to rebuild the draw label
294 virtual void buildDrawLabel( void ); 295 virtual void buildDrawLabel( void );