diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-12-13 10:08:55 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-12-13 10:08:55 -0500 |
| commit | 618249155ae333c64c693a0f7f38453f3c871787 (patch) | |
| tree | db28a3725a4e099735d4ce457ecf90267f8401da /indra/newview/lllistcontextmenu.h | |
| parent | 6f8ff871cdd0402d07800444f0524079fe02fac6 (diff) | |
| parent | e27bcbe0d20c87556b0bcb1e3feaaea6544d3e16 (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/lllistcontextmenu.h')
| -rw-r--r-- | indra/newview/lllistcontextmenu.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/lllistcontextmenu.h b/indra/newview/lllistcontextmenu.h index 5dedc30b0c..fabd68ee20 100644 --- a/indra/newview/lllistcontextmenu.h +++ b/indra/newview/lllistcontextmenu.h @@ -71,8 +71,7 @@ protected: static void handleMultiple(functor_t functor, const uuid_vec_t& ids); uuid_vec_t mUUIDs; - LLContextMenu* mMenu; - LLHandle<LLView> mMenuHandle; + LLHandle<LLContextMenu> mMenuHandle; }; #endif // LL_LLLISTCONTEXTMENU_H |