diff --git a/.gitignore b/.gitignore
index 1ff03788d173d27957f3b385c8736a12ee3f6562..d10860d49a6c458862834f78784f81e5a5f699ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
.metadata
+bigbluebutton-client/.actionScriptProperties
+bigbluebutton-client/.flexProperties
diff --git a/bigbluebutton-client/.actionScriptProperties b/bigbluebutton-client/.actionScriptProperties
index 38aa89b2341223e8c8b2b2c6e9f6f44f2d40bb21..c040cb2c2803f33bccdf7c4f927a8e62113d9443 100755
--- a/bigbluebutton-client/.actionScriptProperties
+++ b/bigbluebutton-client/.actionScriptProperties
@@ -1,51 +1,52 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<actionScriptProperties mainApplicationPath="BigBlueButton.mxml" projectUUID="2f78753b-2e4c-41b4-8cf4-eddb768eb4b3" version="6">
- <compiler additionalCompilerArguments="-locale=" autoRSLOrdering="false" copyDependentFiles="true" flexSDK="Flex 3.5" fteInMXComponents="false" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin" sourceFolderPath="src" strict="true" targetPlayerVersion="10.0.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
- <compilerSourcePath/>
- <libraryPath defaultLinkType="1">
- <libraryPathEntry kind="4" path="">
- <modifiedEntries>
- <libraryPathEntry kind="3" linkType="4" path="${PROJECT_FRAMEWORKS}/libs/framework.swc" useDefaultLinkType="true">
- <crossDomainRsls>
- <crossDomainRslEntry autoExtract="true" policyFileUrl="" rslUrl="framework_3.1.0.2710.swz"/>
- <crossDomainRslEntry autoExtract="true" policyFileUrl="" rslUrl="framework_3.1.0.2710.swf"/>
- </crossDomainRsls>
- </libraryPathEntry>
- </modifiedEntries>
- <excludedEntries>
- <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/qtp.swc" useDefaultLinkType="false"/>
- <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation.swc" useDefaultLinkType="false"/>
- <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_dmv.swc" useDefaultLinkType="false"/>
- <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_agent.swc" useDefaultLinkType="false"/>
- </excludedEntries>
- </libraryPathEntry>
- <libraryPathEntry kind="1" linkType="1" path="libs"/>
- </libraryPath>
- <sourceAttachmentPath/>
- </compiler>
- <applications>
- <application path="src/main.mxml"/>
- <application path="MessagingUnitTests.mxml"/>
- <application path="BigBlueButton.mxml"/>
- <application path="BigBlueButtonUnitTests.mxml"/>
- <application path="DeskshareStandalone.mxml"/>
- <application path="src/TestRunners.mxml"/>
- </applications>
- <modules>
- <module application="src/BigBlueButton.mxml" destPath="DynamicInfoModule.swf" optimize="true" sourcePath="src/DynamicInfoModule.mxml"/>
- <module application="src/BigBlueButton.mxml" destPath="PhoneModule.swf" optimize="true" sourcePath="src/PhoneModule.mxml"/>
- <module application="src/BigBlueButton.mxml" destPath="PresentModule.swf" optimize="true" sourcePath="src/PresentModule.mxml"/>
- <module application="src/BigBlueButton.mxml" destPath="ExampleChatModule.swf" optimize="true" sourcePath="src/ExampleChatModule.mxml"/>
- <module application="src/BigBlueButton.mxml" destPath="DeskShareModule.swf" optimize="true" sourcePath="src/DeskShareModule.mxml"/>
- <module application="src/BigBlueButton.mxml" destPath="VideoconfModule.swf" optimize="true" sourcePath="src/VideoconfModule.mxml"/>
- <module application="src/BigBlueButton.mxml" destPath="ViewersModule.swf" optimize="true" sourcePath="src/ViewersModule.mxml"/>
- <module application="src/BigBlueButton.mxml" destPath="ChatModule.swf" optimize="true" sourcePath="src/ChatModule.mxml"/>
- <module application="src/BigBlueButton.mxml" destPath="ListenersModule.swf" optimize="true" sourcePath="src/ListenersModule.mxml"/>
- <module application="src/BigBlueButton.mxml" destPath="WhiteboardModule.swf" optimize="true" sourcePath="src/WhiteboardModule.mxml"/>
- <module application="src/BigBlueButton.mxml" destPath="BreakoutModule.swf" optimize="true" sourcePath="src/BreakoutModule.mxml"/>
- </modules>
- <buildCSSFiles>
- <buildCSSFileEntry destPath="bin" sourcePath="src/branding/css/logo_basic.css"/>
- <buildCSSFileEntry destPath="bin" sourcePath="src/branding/css/theme.css"/>
- </buildCSSFiles>
-</actionScriptProperties>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<actionScriptProperties analytics="false" mainApplicationPath="BigBlueButton.mxml" projectUUID="2f78753b-2e4c-41b4-8cf4-eddb768eb4b3" version="6">
+ <compiler additionalCompilerArguments="-locale=" autoRSLOrdering="false" copyDependentFiles="true" flexSDK="Flex 3.5" fteInMXComponents="false" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin" sourceFolderPath="src" strict="true" targetPlayerVersion="10.0.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
+ <compilerSourcePath/>
+ <libraryPath defaultLinkType="1">
+ <libraryPathEntry kind="4" path="">
+ <modifiedEntries>
+ <libraryPathEntry kind="3" linkType="4" path="${PROJECT_FRAMEWORKS}/libs/framework.swc" useDefaultLinkType="true">
+ <crossDomainRsls>
+ <crossDomainRslEntry autoExtract="true" policyFileUrl="" rslUrl="framework_3.1.0.2710.swz"/>
+ <crossDomainRslEntry autoExtract="true" policyFileUrl="" rslUrl="framework_3.1.0.2710.swf"/>
+ </crossDomainRsls>
+ </libraryPathEntry>
+ </modifiedEntries>
+ <excludedEntries>
+ <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/qtp.swc" useDefaultLinkType="false"/>
+ <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation.swc" useDefaultLinkType="false"/>
+ <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_dmv.swc" useDefaultLinkType="false"/>
+ <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/automation_agent.swc" useDefaultLinkType="false"/>
+ </excludedEntries>
+ </libraryPathEntry>
+ <libraryPathEntry kind="1" linkType="1" path="libs"/>
+ </libraryPath>
+ <sourceAttachmentPath/>
+ </compiler>
+ <applications>
+ <application path="src/main.mxml"/>
+ <application path="MessagingUnitTests.mxml"/>
+ <application path="BigBlueButton.mxml"/>
+ <application path="BigBlueButtonUnitTests.mxml"/>
+ <application path="DeskshareStandalone.mxml"/>
+ <application path="src/TestRunners.mxml"/>
+ </applications>
+ <modules>
+ <module application="src/BigBlueButton.mxml" destPath="DynamicInfoModule.swf" optimize="true" sourcePath="src/DynamicInfoModule.mxml"/>
+ <module application="src/BigBlueButton.mxml" destPath="PhoneModule.swf" optimize="true" sourcePath="src/PhoneModule.mxml"/>
+ <module application="src/BigBlueButton.mxml" destPath="PresentModule.swf" optimize="true" sourcePath="src/PresentModule.mxml"/>
+ <module application="src/BigBlueButton.mxml" destPath="ExampleChatModule.swf" optimize="true" sourcePath="src/ExampleChatModule.mxml"/>
+ <module application="src/BigBlueButton.mxml" destPath="DeskShareModule.swf" optimize="true" sourcePath="src/DeskShareModule.mxml"/>
+ <module application="src/BigBlueButton.mxml" destPath="VideoconfModule.swf" optimize="true" sourcePath="src/VideoconfModule.mxml"/>
+ <module application="src/BigBlueButton.mxml" destPath="ViewersModule.swf" optimize="true" sourcePath="src/ViewersModule.mxml"/>
+ <module application="src/BigBlueButton.mxml" destPath="ChatModule.swf" optimize="true" sourcePath="src/ChatModule.mxml"/>
+ <module application="src/BigBlueButton.mxml" destPath="ListenersModule.swf" optimize="true" sourcePath="src/ListenersModule.mxml"/>
+ <module application="src/BigBlueButton.mxml" destPath="WhiteboardModule.swf" optimize="true" sourcePath="src/WhiteboardModule.mxml"/>
+ <module application="src/BigBlueButton.mxml" destPath="BreakoutModule.swf" optimize="true" sourcePath="src/BreakoutModule.mxml"/>
+ <module application="src/BigBlueButton.mxml" destPath="SharedNotesModule.swf" optimize="true" sourcePath="src/SharedNotesModule.mxml"/>
+ </modules>
+ <buildCSSFiles>
+ <buildCSSFileEntry destPath="bin" sourcePath="src/branding/css/logo_basic.css"/>
+ <buildCSSFileEntry destPath="bin" sourcePath="src/branding/css/theme.css"/>
+ </buildCSSFiles>
+</actionScriptProperties>
diff --git a/bigbluebutton-client/.flexProperties b/bigbluebutton-client/.flexProperties
index afb930671bcf77c496834ff0e190ffdebf61e78a..b5f031bb062a99059b9dd16d299dc23664d58ab2 100755
--- a/bigbluebutton-client/.flexProperties
+++ b/bigbluebutton-client/.flexProperties
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<flexProperties enableServiceManager="false" flexServerFeatures="0" flexServerType="0" toolCompile="true" useServerFlexSDK="false" version="1"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flexProperties enableServiceManager="false" flexServerFeatures="0" flexServerType="0" toolCompile="true" useServerFlexSDK="false" version="1"/>
diff --git a/bigbluebutton-client/resources/config.xml.template b/bigbluebutton-client/resources/config.xml.template
index a4ebe9d60dcff2142a6177410585233f7b8fa2e1..6cf50503a5bf628e834ab8c1e7373927a978f420 100755
--- a/bigbluebutton-client/resources/config.xml.template
+++ b/bigbluebutton-client/resources/config.xml.template
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<config>
- <localeversion>0.71</localeversion>
+ <localeversion suppressWarning="true">0.71</localeversion>
<version>VERSION</version>
<help url="http://HOST/help.html"/>
<porttest host="HOST" application="video"/>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/events/AppVersionEvent.as b/bigbluebutton-client/src/org/bigbluebutton/main/events/AppVersionEvent.as
index ca67ab73b5606de155021c76799ffb51948cc597..b0e80a81e61eb740010d2068d70053bfa950710d 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/events/AppVersionEvent.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/events/AppVersionEvent.as
@@ -8,6 +8,7 @@ package org.bigbluebutton.main.events
public static const APP_VERSION_EVENT:String = "APP VERSION EVENT";
public var appVersion:String;
public var localVersion:String;
+ public var suppressLocaleWarning:Boolean;
public function AppVersionEvent()
{
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/ConfigParameters.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/ConfigParameters.as
index 13c875127f577d5645ba0b8b3153fc6217520b26..e6de0e856d08443cf101b7e17458aeb718ea66c6 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/ConfigParameters.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/ConfigParameters.as
@@ -38,6 +38,7 @@ package org.bigbluebutton.main.model
public var version:String;
public var localeVersion:String;
+ public var suppressLocaleWarning:Boolean = false;
public var portTestHost:String;
public var portTestApplication:String;
public var helpURL:String;
@@ -80,6 +81,7 @@ package org.bigbluebutton.main.model
helpURL = xml.help.@url;
version = xml.version;
localeVersion = xml.localeversion;
+ if (xml.localeversion.@suppressWarning == "true") suppressLocaleWarning = true;
if (xml.language.@userSelectionEnabled == "true") languageEnabled = true;
else languageEnabled = false;
if (xml.skinning.@enabled == "true") skinning = xml.skinning.@url;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModuleManager.as b/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModuleManager.as
index e9aa136f96ee87d130b99e2d1bc3cd1c7517a8d7..ff1df6d03d33be4beeb2261b565869b932319dda 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModuleManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModuleManager.as
@@ -150,7 +150,8 @@ package org.bigbluebutton.main.model.modules
var dispatcher:Dispatcher = new Dispatcher();
var versionEvent:AppVersionEvent = new AppVersionEvent();
versionEvent.appVersion = configParameters.version;
- versionEvent.localVersion = configParameters.localeVersion;
+ versionEvent.localVersion = configParameters.localeVersion;
+ versionEvent.suppressLocaleWarning = configParameters.suppressLocaleWarning;
dispatcher.dispatchEvent(versionEvent);
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
index 497e4277fd7b71c3a9a11714eda19bf60fe4f6dd..8ee06fa94add5a8777b43b362c820ab4ea978c2c 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
@@ -114,7 +114,8 @@
private function handleApplicationVersionEvent(event:AppVersionEvent):void {
appVersion = event.appVersion;
localeVersion = event.localVersion;
- checkLocaleVersion(localeVersion);
+
+ if (!event.suppressLocaleWarning) checkLocaleVersion(localeVersion);
}
private function fullScreenHandler(evt:FullScreenEvent):void {