summaryrefslogtreecommitdiff
path: root/indra/llui/llmenugl.h
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2010-12-13 12:34:39 -0800
committerDon Kjer <don@lindenlab.com>2010-12-13 12:34:39 -0800
commit9a322d1b7a6ee5380f8724b33a20c56c9583f093 (patch)
tree70ee8e942f30ac3ed2f371b60cfcba9adfd961c2 /indra/llui/llmenugl.h
parentf4884faf3a020a718c611f34aa534e80d8a8b666 (diff)
parente27bcbe0d20c87556b0bcb1e3feaaea6544d3e16 (diff)
Merge from viewer-development
Diffstat (limited to 'indra/llui/llmenugl.h')
-rw-r--r--indra/llui/llmenugl.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index 35544402f4..7bde8e83ec 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -678,9 +678,12 @@ public:
BOOL appendContextSubMenu(LLContextMenu *menu);
+ LLHandle<LLContextMenu> getHandle() { mHandle.bind(this); return mHandle; }
+
protected:
- BOOL mHoveredAnyItem;
- LLMenuItemGL* mHoverItem;
+ BOOL mHoveredAnyItem;
+ LLMenuItemGL* mHoverItem;
+ LLRootHandle<LLContextMenu> mHandle;
};