summaryrefslogtreecommitdiff
path: root/indra/newview/llavataractions.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/llavataractions.h
parent1e47e5b42d352d5d838eeb96984dbf6497020e32 (diff)
parent9d71aae8273fd44dada82b1005c121255dc14dda (diff)
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llavataractions.h')
-rw-r--r--indra/newview/llavataractions.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llavataractions.h b/indra/newview/llavataractions.h
index c751661acf..16a58718a2 100644
--- a/indra/newview/llavataractions.h
+++ b/indra/newview/llavataractions.h
@@ -124,6 +124,11 @@ public:
static bool isBlocked(const LLUUID& id);
/**
+ * @return true if you can block the avatar
+ */
+ static bool canBlock(const LLUUID& id);
+
+ /**
* Return true if the avatar is in a P2P voice call with a given user
*/
/* AD *TODO: Is this function needed any more?