Index: openacs-4/packages/chat/chat.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/chat.info,v
diff -u -N -r1.22.2.4 -r1.22.2.5
--- openacs-4/packages/chat/chat.info	1 Mar 2019 17:25:59 -0000	1.22.2.4
+++ openacs-4/packages/chat/chat.info	1 Mar 2019 17:40:55 -0000	1.22.2.5
@@ -9,7 +9,7 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
 
-    <version name="6.0.0d1" url="http://openacs.org/repository/download/apm/chat-6.0.0d1.apm">
+    <version name="6.0.0d2" url="http://openacs.org/repository/download/apm/chat-6.0.0d2.apm">
         <owner url="http://www.openacs.org">Peter Alberer</owner>
         <summary>Server based chat with an html and ajax client.</summary>
         <release-date>2019-03-01</release-date>
@@ -22,7 +22,7 @@
         </description>
         <maturity>0</maturity>
 
-        <provides url="chat" version="6.0.0d1"/>
+        <provides url="chat" version="6.0.0d2"/>
         <requires url="acs-kernel" version="5.9.1"/>
         <requires url="xowiki" version="5.10.0d17"/>
 
Index: openacs-4/packages/chat/sql/oracle/chat-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/sql/oracle/chat-create.sql,v
diff -u -N -r1.5.2.4 -r1.5.2.5
--- openacs-4/packages/chat/sql/oracle/chat-create.sql	1 Mar 2019 17:25:59 -0000	1.5.2.4
+++ openacs-4/packages/chat/sql/oracle/chat-create.sql	1 Mar 2019 17:40:55 -0000	1.5.2.5
@@ -33,8 +33,6 @@
     acs_privilege.create_privilege('chat_read', 'View chat message');
     acs_privilege.create_privilege('chat_write', 'Write chat message');
 
-    acs_privilege.create_privilege('chat_avatar_allow', 'Enable/disable user avatars in a chat room');
-
     -- Set of privileges for regular chat user.
     acs_privilege.create_privilege('chat_user', 'Regular chat user');
     acs_privilege.add_child('chat_user', 'chat_read');
@@ -62,7 +60,6 @@
     acs_privilege.add_child('chat_room_admin', 'chat_moderator_grant');
     acs_privilege.add_child('chat_room_admin', 'chat_moderator_revoke');
     acs_privilege.add_child('chat_room_admin', 'chat_moderator');
-    acs_privilege.add_child('chat_room_admin', 'chat_avatar_allow');
 
     -- Site wite admin also administrator of the chat room.
     acs_privilege.add_child('admin', 'chat_room_admin');
Index: openacs-4/packages/chat/sql/oracle/chat-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/sql/oracle/chat-drop.sql,v
diff -u -N -r1.3.8.3 -r1.3.8.4
--- openacs-4/packages/chat/sql/oracle/chat-drop.sql	28 Feb 2019 16:09:03 -0000	1.3.8.3
+++ openacs-4/packages/chat/sql/oracle/chat-drop.sql	1 Mar 2019 17:40:56 -0000	1.3.8.4
@@ -50,7 +50,6 @@
     acs_privilege.remove_child('chat_room_admin', 'chat_moderator_grant');
     acs_privilege.remove_child('chat_room_admin', 'chat_moderator_revoke');
     acs_privilege.remove_child('chat_room_admin', 'chat_moderator');
-    acs_privilege.remove_child('chat_room_admin', 'chat_avatar_allow');
 
     acs_privilege.remove_child('admin', 'chat_room_admin');
 
@@ -75,7 +74,6 @@
     acs_privilege.drop_privilege('chat_room_admin');
     acs_privilege.drop_privilege('chat_moderator');
     acs_privilege.drop_privilege('chat_user');
-    acs_privilege.drop_privilege('chat_avatar_allow');
 end;
 /
 show errors
Index: openacs-4/packages/chat/sql/oracle/upgrade/upgrade-6.0.0d1-6.0.0d2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/sql/oracle/upgrade/Attic/upgrade-6.0.0d1-6.0.0d2.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/chat/sql/oracle/upgrade/upgrade-6.0.0d1-6.0.0d2.sql	1 Mar 2019 17:40:56 -0000	1.1.2.1
@@ -0,0 +1,12 @@
+---
+--- Upgrade script from 6.0.0d1 to 6.0.0d2
+---
+--- Remove the unused privilege 'chat_avatar_allow'
+---
+--- @author Hector Romojaro (hector.romojaro@gmail.com)
+--- @creation-date 01/03/2019
+--- @cvs-id $Id: upgrade-6.0.0d1-6.0.0d2.sql,v 1.1.2.1 2019/03/01 17:40:56 hectorr Exp $
+---
+
+acs_privilege.remove_child('chat_room_admin', 'chat_avatar_allow');
+acs_privilege.drop_privilege('chat_avatar_allow');
Index: openacs-4/packages/chat/sql/postgresql/chat-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/sql/postgresql/chat-create.sql,v
diff -u -N -r1.10.2.4 -r1.10.2.5
--- openacs-4/packages/chat/sql/postgresql/chat-create.sql	1 Mar 2019 17:25:59 -0000	1.10.2.4
+++ openacs-4/packages/chat/sql/postgresql/chat-create.sql	1 Mar 2019 17:40:56 -0000	1.10.2.5
@@ -32,8 +32,6 @@
 select acs_privilege__create_privilege('chat_read', 'View chat message', null);
 select acs_privilege__create_privilege('chat_write', 'Write chat message', null);
 
-select acs_privilege__create_privilege('chat_avatar_allow', 'Enable/disable user avatars in a chat room', null);
-
 -- Set of privileges for regular chat user.
 select acs_privilege__create_privilege('chat_user', 'Regular chat user', null);
 select acs_privilege__add_child('chat_user', 'chat_read');
@@ -61,7 +59,6 @@
 select acs_privilege__add_child('chat_room_admin', 'chat_moderator_grant');
 select acs_privilege__add_child('chat_room_admin', 'chat_moderator_revoke');
 select acs_privilege__add_child('chat_room_admin', 'chat_moderator');
-select acs_privilege__add_child('chat_room_admin', 'chat_avatar_allow');
 
 -- Site wite admin also administrator of the chat room.
 select acs_privilege__add_child('admin', 'chat_room_admin');
Index: openacs-4/packages/chat/sql/postgresql/chat-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/sql/postgresql/chat-drop.sql,v
diff -u -N -r1.5.2.4 -r1.5.2.5
--- openacs-4/packages/chat/sql/postgresql/chat-drop.sql	1 Mar 2019 17:26:00 -0000	1.5.2.4
+++ openacs-4/packages/chat/sql/postgresql/chat-drop.sql	1 Mar 2019 17:40:56 -0000	1.5.2.5
@@ -45,7 +45,6 @@
  PERFORM acs_privilege__remove_child('chat_room_admin', 'chat_moderator_grant');
  PERFORM acs_privilege__remove_child('chat_room_admin', 'chat_moderator_revoke');
  PERFORM acs_privilege__remove_child('chat_room_admin', 'chat_moderator');
- PERFORM acs_privilege__remove_child('chat_room_admin', 'chat_avatar_allow');
 
  -- remove Site wite admin also administrator of the chat room
  PERFORM acs_privilege__remove_child('admin', 'chat_room_admin');
@@ -71,7 +70,6 @@
  PERFORM acs_privilege__drop_privilege('chat_room_admin');
  PERFORM acs_privilege__drop_privilege('chat_moderator');
  PERFORM acs_privilege__drop_privilege('chat_user');
- PERFORM acs_privilege__drop_privilege('chat_avatar_allow');
 
   return 0;
 END;
Index: openacs-4/packages/chat/sql/postgresql/upgrade/upgrade-6.0.0d1-6.0.0d2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/sql/postgresql/upgrade/Attic/upgrade-6.0.0d1-6.0.0d2.sql,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/chat/sql/postgresql/upgrade/upgrade-6.0.0d1-6.0.0d2.sql	1 Mar 2019 17:40:56 -0000	1.1.2.1
@@ -0,0 +1,12 @@
+---
+--- Upgrade script from 6.0.0d1 to 6.0.0d2
+---
+--- Remove the unused privilege 'chat_avatar_allow'
+---
+--- @author Hector Romojaro (hector.romojaro@gmail.com)
+--- @creation-date 01/03/2019
+--- @cvs-id $Id: upgrade-6.0.0d1-6.0.0d2.sql,v 1.1.2.1 2019/03/01 17:40:56 hectorr Exp $
+---
+
+PERFORM acs_privilege__remove_child('chat_room_admin', 'chat_avatar_allow');
+PERFORM acs_privilege__drop_privilege('chat_avatar_allow');
Index: openacs-4/packages/chat/www/room.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room.tcl,v
diff -u -N -r1.11.2.2 -r1.11.2.3
--- openacs-4/packages/chat/www/room.tcl	26 Feb 2019 18:06:43 -0000	1.11.2.2
+++ openacs-4/packages/chat/www/room.tcl	1 Mar 2019 17:40:56 -0000	1.11.2.3
@@ -47,7 +47,6 @@
 set moderator_grant_p   [permission::permission_p -object_id $room_id -privilege chat_moderator_grant]
 set moderator_revoke_p  [permission::permission_p -object_id $room_id -privilege chat_moderator_revoke]
 set transcript_create_p [permission::permission_p -object_id $room_id -privilege chat_transcript_create]
-set avatar_allow_p      [permission::permission_p -object_id $room_id -privilege chat_avatar_allow]
 
 ###
 # Get room basic information.