Index: C:/code/jackbe/sites/all/modules/activity/activity.module
===================================================================
--- C:/code/jackbe/sites/all/modules/activity/activity.module	(revision 436)
+++ C:/code/jackbe/sites/all/modules/activity/activity.module	(revision 570)
@@ -413,7 +413,7 @@
       
     // Provide a privacy setting to users to opt-out of appearing in activity pages.
     case 'form':
-      if ($category == 'account' && variable_get('activity_user_optout', 0)) {
+      if ($category == 'account' && (variable_get('activity_user_optout', 0) || user_access('hide activity'))) {
         $form['activity'] = array(
           '#type' => 'fieldset',
           '#title' => t('Activity privacy settings'),
@@ -1081,7 +1081,7 @@
  * Check if user has activity privacy optout set.
  */
 function activity_user_privacy_optout($user) {
-  if (variable_get('activity_user_optout', 0) && $user->activity_optout) {
+	if ((variable_get('activity_user_optout', 0) || user_access('hide activity')) && $user->activity_optout) {
     return TRUE;
   }
   return FALSE;
Index: C:/code/jackbe/sites/all/modules/activity/contrib/commentactivity/commentactivity.module
===================================================================
--- C:/code/jackbe/sites/all/modules/activity/contrib/commentactivity/commentactivity.module	(revision 436)
+++ C:/code/jackbe/sites/all/modules/activity/contrib/commentactivity/commentactivity.module	(revision 570)
@@ -148,9 +148,9 @@
       }
 
       // User hide activity permission check
-      if (user_access('hide activity', $user)) {
+      /*if (user_access('hide activity', $user)) {
         return FALSE;
-      }
+      }*/
 
       $node = node_load($comment['nid']);
 
Index: C:/code/jackbe/sites/all/modules/activity/contrib/user_relationshipsactivity/user_relationshipsactivity.module
===================================================================
--- C:/code/jackbe/sites/all/modules/activity/contrib/user_relationshipsactivity/user_relationshipsactivity.module	(revision 436)
+++ C:/code/jackbe/sites/all/modules/activity/contrib/user_relationshipsactivity/user_relationshipsactivity.module	(revision 570)
@@ -192,9 +192,9 @@
   }
 
   // User hide activity permission check
-  if (user_access('hide activity', $user)) {
+  /*if (user_access('hide activity', $user)) {
     return FALSE;
-  }
+  }*/
 
   $data = array(
     'requestee-uid'         => $relationship['requestee_id'],
Index: C:/code/jackbe/sites/all/modules/activity/contrib/nodeactivity/nodeactivity.module
===================================================================
--- C:/code/jackbe/sites/all/modules/activity/contrib/nodeactivity/nodeactivity.module	(revision 436)
+++ C:/code/jackbe/sites/all/modules/activity/contrib/nodeactivity/nodeactivity.module	(revision 570)
@@ -93,9 +93,9 @@
         }
 
         // User hide activity permission check
-        if (user_access('hide activity', $user)) {
+        /*if (user_access('hide activity', $user)) {
           return FALSE;
-        }
+        }*/
 
         $data = array(
           'operation' 	=> $operation,
Index: C:/code/jackbe/sites/all/modules/activity/contrib/ogactivity/ogactivity.module
===================================================================
--- C:/code/jackbe/sites/all/modules/activity/contrib/ogactivity/ogactivity.module	(revision 436)
+++ C:/code/jackbe/sites/all/modules/activity/contrib/ogactivity/ogactivity.module	(revision 570)
@@ -103,9 +103,9 @@
       }
 
       // User hide activity permission check
-      if (user_access('hide activity', $user)) {
+      /*if (user_access('hide activity', $user)) {
         return FALSE;
-      }
+      }*/
 
       $data = array(
         'operation' 	=> $op,
Index: C:/code/jackbe/sites/all/modules/activity/contrib/favorite_nodesactivity/favorite_nodesactivity.module
===================================================================
--- C:/code/jackbe/sites/all/modules/activity/contrib/favorite_nodesactivity/favorite_nodesactivity.module	(revision 436)
+++ C:/code/jackbe/sites/all/modules/activity/contrib/favorite_nodesactivity/favorite_nodesactivity.module	(revision 570)
@@ -93,9 +93,9 @@
   }
 
   // User hide activity permission check
-  if (user_access('hide activity', $user)) {
+  /*if (user_access('hide activity', $user)) {
     return FALSE;
-  }
+  }*/
 
   $data = array(
     'operation' 	=> $operation,
Index: C:/code/jackbe/sites/all/modules/activity/contrib/flagactivity/flagactivity.module
===================================================================
--- C:/code/jackbe/sites/all/modules/activity/contrib/flagactivity/flagactivity.module	(revision 436)
+++ C:/code/jackbe/sites/all/modules/activity/contrib/flagactivity/flagactivity.module	(revision 570)
@@ -122,9 +122,9 @@
   }
 
   // User hide activity permission check
-  if (user_access('hide activity', $user)) {
+  /*if (user_access('hide activity', $user)) {
     return FALSE;
-  }
+  }*/
 
   $data = array(
     'operation' 	=> $op,
Index: C:/code/jackbe/sites/all/modules/activity/contrib/votingapiactivity/votingapiactivity.module
===================================================================
--- C:/code/jackbe/sites/all/modules/activity/contrib/votingapiactivity/votingapiactivity.module	(revision 436)
+++ C:/code/jackbe/sites/all/modules/activity/contrib/votingapiactivity/votingapiactivity.module	(revision 570)
@@ -110,9 +110,9 @@
     }
     
     // User hide activity permission check
-    if (user_access('hide activity', $user)) {
+    /*if (user_access('hide activity', $user)) {
       return FALSE;
-    }
+    }*/
 
     // Only handle votes on nodes or comments for now
     if ($vote['content_type'] == 'node') {