summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelavatar.h
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-02-03 17:56:36 -0500
committerLoren Shih <seraph@lindenlab.com>2010-02-03 17:56:36 -0500
commitd49e5bcbe26a4b148ce1d20a60d16581f41134c0 (patch)
treebd8caf39e789437574119304688ba3c71b7940cf /indra/newview/llpanelavatar.h
parent1e47e5b42d352d5d838eeb96984dbf6497020e32 (diff)
parent9d71aae8273fd44dada82b1005c121255dc14dda (diff)
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llpanelavatar.h')
-rw-r--r--indra/newview/llpanelavatar.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llpanelavatar.h b/indra/newview/llpanelavatar.h
index ce59f1e93d..632590aa27 100644
--- a/indra/newview/llpanelavatar.h
+++ b/indra/newview/llpanelavatar.h
@@ -192,12 +192,18 @@ protected:
*/
void share();
+ /**
+ * Add/remove resident to/from your block list.
+ */
+ void toggleBlock();
+
void kick();
void freeze();
void unfreeze();
void csr();
-
+ bool checkOverflowMenuItem(const LLSD& param);
+ bool enableOverflowMenuItem(const LLSD& param);
bool enableGod();