Index: lams_flash/src/central/flash/main2.as
===================================================================
diff -u -rd7823922f404944822957e6c051bc0f1335a76de -rb5f1c6147aeaaec0f5084813209fe0cf59a1c386
--- lams_flash/src/central/flash/main2.as	(.../main2.as)	(revision d7823922f404944822957e6c051bc0f1335a76de)
+++ lams_flash/src/central/flash/main2.as	(.../main2.as)	(revision b5f1c6147aeaaec0f5084813209fe0cf59a1c386)
@@ -1,12 +1,18 @@
 import org.lamsfoundation.lams.learner.Application;
 import org.lamsfoundation.lams.common.util.StringUtils;
+import com.macromedia.javascript.JavaScriptProxy;
+import org.lamsfoundation.lams.common.util.Debugger;
 
 //Temp values to be removed / repplaced at deployment
 /**/
 _global.myRoot = this;
 
+if(StringUtils.isEmpty(presenceServerUrl)){
+	_root.presenceServerUrl = "192.168.1.1";
+	Debugger.log('presenceServerUrl is not defined, using defualt:'+_root.presenceServerUrl ,Debugger.CRITICAL,'main','ROOT');			
+}
+
 if(StringUtils.isEmpty(serverURL)){
-	//_root.serverURL = "http://dolly.uklams.net:8080/lams/";
 	_root.serverURL = "http://localhost:8080/lams/";
 	Debugger.log('serverURL is not defined, using defualt:'+_root.serverURL ,Debugger.CRITICAL,'main','ROOT');			
 }
@@ -16,6 +22,16 @@
 	Debugger.log('userID is not defined, using defualt:'+_root.userID ,Debugger.CRITICAL,'main','ROOT');			
 }
 
+if(StringUtils.isEmpty(firstName)){
+	_root.firstName = "firstName";
+	Debugger.log('firstName is not defined, using defualt:'+_root.firstName ,Debugger.CRITICAL,'main','ROOT');			
+}
+
+if(StringUtils.isEmpty(lastName)){
+	_root.lastName = "lastName";
+	Debugger.log('lastName is not defined, using defualt:'+_root.lastName ,Debugger.CRITICAL,'main','ROOT');			
+}
+
 if(StringUtils.isEmpty(mode)){
 	_root.mode = 1;
 	Debugger.log('Mode is not defined, using defualt:'+_root.mode,Debugger.CRITICAL,'main','ROOT');			
@@ -35,6 +51,8 @@
 	_root.langDate = "01-01-1970";
 }
 
+Debugger.log("PRESENCE: connection info from controlFrame - " + userID + " " + firstName + " " + lastName + " " + presenceServerUrl, Debugger.MED,'main','ROOT');
+
 //Set stage alignment to top left and prent scaling
 Stage.align = "TL";
 Stage.scaleMode = "noScale";
@@ -44,20 +62,29 @@
 var app:Application = Application.getInstance();
 app.main(this);
 
-//------------------------------Local connection to JSPs for progress data ------------------------------
+//Local connection to JSPs for progress data
 var receive_lc = new LocalConnection();
-//-------------------------------------- Functions to setProgress data, called by the LocalConnection object in learner JSPs
+//Functions to setProgress data, called by the LocalConnection object in learner JSPs
 receive_lc.setProgressData = function(attempted, completed, current, lessonID, version, refresh) {
-	Debugger.log(arguments.toString(), 'learnerProgress_lc.setProgressData');
+	Debugger.log(arguments.toString(), Debugger.CRITICAL, 'learnerProgress_lc.setProgressData', 'ROOT');
 	app.refreshProgress(attempted, completed, current, lessonID, version);
 	myRoot.refresh = refresh;
 };
 
 var success = receive_lc.connect("learnerProgress_lc_" + uniqueID);
 
-//Make app listener for stage resize events
-Stage.addListener(app);
+//Declaration of proxy object for javascript integration kit
+var proxy:JavaScriptProxy = new JavaScriptProxy(_root.lcId, this);
+_root.proxy = proxy;
 
+function sendMessageToFlash(msg:String){
+	Debugger.log("PRESENCE: from javascript - " + msg, Debugger.MED, 'sendMessageToFlash', 'ROOT');
+}
 
+function sendUsersToFlash(users:Array){
+	Debugger.log('PRESENCE: ' + users, Debugger.MED, 'sendUsersToFlash', 'ROOT');
+	app.getPresence().setupDataGrid(users);
+}
 
-
+//Make app listener for stage resize events
+Stage.addListener(app);