Merge branch 'master' into snapshotserver
[potlatch2.git] / net / systemeD / potlatch2 / panels / BackgroundPanel.mxml
index aaa44df0eb78916d52e6d16a4a753f2a57ae318d..2895e75560c87703e5165b7d8d8c1e110a1d2492 100644 (file)
@@ -4,7 +4,10 @@
     Background Panel
 -->
 
-<mx:VBox xmlns:mx="http://www.adobe.com/2006/mxml" height="100%">
+<mx:VBox
+    xmlns:fx="http://ns.adobe.com/mxml/2009"
+    xmlns:mx="library://ns.adobe.com/flex/mx"
+    height="100%">
   <mx:Text id="backgroundPanelText" text="You have selected a Background Feature." width="100%" styleName="helpInfo" />
   <mx:DataGrid editable="false" id="backgroundPanelDG" width="100%" height="50%">
     <mx:columns>
@@ -23,7 +26,7 @@
       <mx:Button label="Not complete" click="markNotComplete()"/>
     </mx:VBox>
   </mx:ViewStack>
-  <mx:Script><![CDATA[
+  <fx:Script><![CDATA[
 
       import net.systemeD.halcyon.connection.*;
       import net.systemeD.halcyon.MapPaint;
@@ -84,5 +87,5 @@
           }
       }
       ]]>
-  </mx:Script>
+  </fx:Script>
 </mx:VBox>
\ No newline at end of file