From 7687d9dd00b032acbe8d71e90849e325add2c14b Mon Sep 17 00:00:00 2001
From: Chad Pilkey <capilkey@gmail.com>
Date: Tue, 9 Feb 2016 11:15:17 -0800
Subject: [PATCH] show chat options tab when private chat disabled

---
 .../modules/chat/views/AddChatTabBox.mxml              | 10 ++++++++++
 .../org/bigbluebutton/modules/chat/views/ChatView.mxml |  6 ++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
index 2b9fe84d3a..600099b137 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
@@ -58,6 +58,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
             
             private function onCreationComplete():void{
                 users = UserManager.getInstance().getConference().users;
+                
+                if (!chatOptions.privateEnabled) {
+                    usersList.includeInLayout = usersList.visible = false;
+                }
+                
                 if (fontSizes.indexOf(chatOptions.fontSize) != -1) {
                     cmbFontSize.selectedItem = chatOptions.fontSize;
                     changeFontSize(); // have to manually call it because the change event doesn't fire
@@ -107,8 +112,13 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
             * For the Options tab focus the users list instead of the text area.
             **/
             public function focusToTextMessageArea():void {
+              if (usersList.visible) {
                 usersList.setFocus();
                 usersList.drawFocus(true);
+              } else {
+                cmbFontSize.setFocus();
+                cmbFontSize.drawFocus(true);
+              }
             }
           
           private function lockSettingsChanged(e:Event):void {
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
index 8941392a1b..b47cf15b3e 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
@@ -91,10 +91,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				openChatBoxFor(PUBLIC_CHAT_USERID, true);
 				makePublicChatUncloseable();
 				
-				if (chatOptions.privateEnabled) {
-					createAddTabBox();
-					makeAddPrivateChatUncloseable();
-				}
+				createAddTabBox();
+				makeAddPrivateChatUncloseable();
 				
 				ResourceUtil.getInstance().addEventListener(Event.CHANGE, localeChanged); // Listen for locale changing