summaryrefslogtreecommitdiff
path: root/indra/newview/llbottomtray.h
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-12-02 10:50:17 -0800
committerSteve Bennetts <steve@lindenlab.com>2009-12-02 10:50:17 -0800
commitd550339958c14f0d7fd222a8531df639eac49e63 (patch)
tree2adfe920202a4304fc37446fca5f9bd368995749 /indra/newview/llbottomtray.h
parent6e1f6f015394a3f268608061c00993939c891e54 (diff)
parent3c8f89246712d1e5391ab1bdd6bbc36a83f210d8 (diff)
Merge from product-engine
Diffstat (limited to 'indra/newview/llbottomtray.h')
-rw-r--r--indra/newview/llbottomtray.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h
index 728a420324..91ec01654b 100644
--- a/indra/newview/llbottomtray.h
+++ b/indra/newview/llbottomtray.h
@@ -179,6 +179,10 @@ protected:
static void* createNearbyChatBar(void* userdata);
+ void updateContextMenu(S32 x, S32 y, MASK mask);
+ void onContextMenuItemClicked(const LLSD& userdata);
+ bool onContextMenuItemEnabled(const LLSD& userdata);
+
/**
* Creates IM Chiclet based on session type (IM chat or Group chat)
*/